From 8bfe7679fac173609290477548918cafafda2a9a Mon Sep 17 00:00:00 2001 From: Lloyd Date: Sun, 4 Dec 2022 03:12:24 +0900 Subject: [PATCH] Scala 3 release (#354) * Bump versions for release * Bump to SNAPSHOT verions Signed-off-by: Lloyd --- build.sbt | 26 +++++++++++++++++++++++--- project/Versions.scala | 6 +++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index bfa3858f..04e36bba 100644 --- a/build.sbt +++ b/build.sbt @@ -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 += { @@ -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) @@ -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") { @@ -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" ) ) diff --git a/project/Versions.scala b/project/Versions.scala index 8786f5d4..ecff83e3 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -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" } }