Skip to content

Commit

Permalink
Scala 3 release (#354)
Browse files Browse the repository at this point in the history
* Bump versions for release

* Bump to SNAPSHOT verions

Signed-off-by: Lloyd <[email protected]>
  • Loading branch information
lloydmeta authored Dec 3, 2022
1 parent 6ac99af commit 8bfe767
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
26 changes: 23 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ lazy val coreJVMTests = Project(id = "coreJVMTests", base = file("enumeratum-cor
.settings(testSettings)
.settings(
name := "coreJVMTests",
version := Versions.Core.stable,
version := Versions.Core.head,
crossScalaVersions := scalaVersionsAll,
Test / sourceGenerators += CoreJVMTest.testsGenerator,
libraryDependencies += {
Expand All @@ -268,6 +268,25 @@ lazy val scalaXmlTest = Def.setting[ModuleID] {
"org.scala-lang.modules" %% "scala-xml" % ver % Test
}

lazy val testsAggregate = aggregateProject("test", enumeratumTestJs, enumeratumTestJvm)
// Project models used in test for some subprojects
lazy val enumeratumTest = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure)
.in(file("enumeratum-test"))
.settings(testSettings)
.jsSettings(jsTestSettings)
.settings(commonWithPublishSettings)
.settings(
name := "enumeratum-test",
version := Versions.Core.head,
crossScalaVersions := scalaVersionsAll,
libraryDependencies += {
"com.beachape" %%% "enumeratum" % Versions.Core.stable
}
)
lazy val enumeratumTestJs = enumeratumTest.js
lazy val enumeratumTestJvm = enumeratumTest.jvm

lazy val enumeratumReactiveMongoBson =
Project(id = "enumeratum-reactivemongo-bson", base = file("enumeratum-reactivemongo-bson"))
.settings(commonWithPublishSettings)
Expand Down Expand Up @@ -606,7 +625,7 @@ lazy val enumeratumDoobie =
.settings(testSettings)
.settings(
crossScalaVersions := scalaVersionsAll,
version := Versions.Macros.head,
version := "1.7.3-SNAPSHOT",
libraryDependencies += {
val ver = {
if (scalaBinaryVersion.value == "2.11") {
Expand Down Expand Up @@ -718,7 +737,8 @@ lazy val resolverSettings = Seq(
resolvers ++= Seq(
"Typesafe Releases" at "https://repo.typesafe.com/typesafe/releases/",
"Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
"Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases"
"Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases",
"Sonatype releases local" at "https://oss.sonatype.org/service/local/repositories/releases/content"
)
)

Expand Down
6 changes: 3 additions & 3 deletions project/Versions.scala
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
object Versions {

object Core {
val stable = "1.7.0"
val stable = "1.7.1"
val head = "1.7.2-SNAPSHOT"
}

object Macros {
val stable = "1.6.1"
val head = "1.6.2-SNAPSHOT"
val stable = "1.6.2"
val head = "1.6.3-SNAPSHOT"
}

}

0 comments on commit 8bfe767

Please sign in to comment.