Skip to content

Commit 8bd3ffc

Browse files
authored
Merge pull request #933 from vlovgr/enumeratum-scala-native
Add Scala Native support for ciris-enumeratum
2 parents cb5e4cc + 998d54e commit 8bd3ffc

3 files changed

Lines changed: 15 additions & 11 deletions

File tree

build.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ lazy val ciris = project
6060
circeYaml,
6161
enumeratum.js,
6262
enumeratum.jvm,
63+
enumeratum.native,
6364
http4s.js,
6465
http4s.jvm,
6566
http4s.native,
@@ -133,7 +134,7 @@ lazy val circeYaml = project
133134
)
134135
.dependsOn(core.jvm)
135136

136-
lazy val enumeratum = crossProject(JSPlatform, JVMPlatform)
137+
lazy val enumeratum = crossProject(JSPlatform, JVMPlatform, NativePlatform)
137138
.in(file("modules/enumeratum"))
138139
.settings(
139140
moduleName := "ciris-enumeratum",
@@ -151,6 +152,7 @@ lazy val enumeratum = crossProject(JSPlatform, JVMPlatform)
151152
testSettings
152153
)
153154
.jsSettings(sharedJsSettings)
155+
.nativeSettings(sharedNativeSettings)
154156
.dependsOn(core)
155157

156158
lazy val http4s = crossProject(JSPlatform, JVMPlatform, NativePlatform)
@@ -354,6 +356,7 @@ lazy val buildInfoSettings = Seq(
354356
BuildInfoKey.map(enumeratum.jvm / moduleName) { case (k, v) => "enumeratum" ++ k.capitalize -> v },
355357
BuildInfoKey.map(enumeratum.jvm / crossScalaVersions) { case (k, v) => "enumeratum" ++ k.capitalize -> v },
356358
BuildInfoKey.map(enumeratum.js / crossScalaVersions) { case (k, v) => "enumeratumJs" ++ k.capitalize -> v },
359+
BuildInfoKey.map(enumeratum.native / crossScalaVersions) { case (k, v) => "enumeratumNative" ++ k.capitalize -> v },
357360
BuildInfoKey.map(http4s.jvm / moduleName) { case (k, v) => "http4s" ++ k.capitalize -> v },
358361
BuildInfoKey.map(http4s.jvm / crossScalaVersions) { case (k, v) => "http4s" ++ k.capitalize -> v },
359362
BuildInfoKey.map(http4s.js / crossScalaVersions) { case (k, v) => "http4sJs" ++ k.capitalize -> v },

docs/src/main/mdoc/overview.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@ Refer to the table below for dependencies and version support across modules.
144144

145145
For Scala.js and Scala Native version support, refer to the following table.
146146

147-
| Module | Scala.js | Scala Native |
148-
| -------------------------- | ------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------- |
149-
| `@CORE_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @CORE_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @CORE_NATIVE_CROSS_SCALA_VERSIONS@) |
150-
| `@CIRCE_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @CIRCE_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @CIRCE_NATIVE_CROSS_SCALA_VERSIONS@) |
151-
| `@CIRCE_YAML_MODULE_NAME@` | - | - |
152-
| `@ENUMERATUM_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @ENUMERATUM_JS_CROSS_SCALA_VERSIONS@) | - |
153-
| `@HTTP4S_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @HTTP4S_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @HTTP4S_NATIVE_CROSS_SCALA_VERSIONS@) |
154-
| `@HTTP4SAWS_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @HTTP4SAWS_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @HTTP4SAWS_NATIVE_CROSS_SCALA_VERSIONS@) |
155-
| `@REFINED_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @REFINED_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @REFINED_NATIVE_CROSS_SCALA_VERSIONS@) |
156-
| `@SQUANTS_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @SQUANTS_JS_CROSS_SCALA_VERSIONS@) | - |
147+
| Module | Scala.js | Scala Native |
148+
| -------------------------- | ------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------ |
149+
| `@CORE_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @CORE_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @CORE_NATIVE_CROSS_SCALA_VERSIONS@) |
150+
| `@CIRCE_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @CIRCE_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @CIRCE_NATIVE_CROSS_SCALA_VERSIONS@) |
151+
| `@CIRCE_YAML_MODULE_NAME@` | - | - |
152+
| `@ENUMERATUM_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @ENUMERATUM_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @ENUMERATUM_NATIVE_CROSS_SCALA_VERSIONS@) |
153+
| `@HTTP4S_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @HTTP4S_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @HTTP4S_NATIVE_CROSS_SCALA_VERSIONS@) |
154+
| `@HTTP4SAWS_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @HTTP4SAWS_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @HTTP4SAWS_NATIVE_CROSS_SCALA_VERSIONS@) |
155+
| `@REFINED_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @REFINED_JS_CROSS_SCALA_VERSIONS@) | Scala Native @SCALA_NATIVE_MAJOR_MINOR_VERSION@ (Scala @REFINED_NATIVE_CROSS_SCALA_VERSIONS@) |
156+
| `@SQUANTS_MODULE_NAME@` | Scala.js @SCALA_JS_MAJOR_MINOR_VERSION@ (Scala @SQUANTS_JS_CROSS_SCALA_VERSIONS@) | - |
157157

158158
## Participation
159159

docs/src/main/scala/ciris/docs/Main.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ object Main {
7474
"DOCS_SCALA_VERSION" -> scalaDocsVersion,
7575
"ENUMERATUM_CROSS_SCALA_VERSIONS" -> scalaVersionsString(enumeratumCrossScalaVersions),
7676
"ENUMERATUM_JS_CROSS_SCALA_VERSIONS" -> scalaVersionsString(enumeratumJsCrossScalaVersions),
77+
"ENUMERATUM_NATIVE_CROSS_SCALA_VERSIONS" -> scalaVersionsString(enumeratumNativeCrossScalaVersions),
7778
"ENUMERATUM_MODULE_NAME" -> enumeratumModuleName,
7879
"ENUMERATUM_VERSION" -> enumeratumVersion,
7980
"HTTP4S_CROSS_SCALA_VERSIONS" -> scalaVersionsString(http4sCrossScalaVersions),

0 commit comments

Comments
 (0)