diff --git a/build.sbt b/build.sbt index 044153ddc7..13747abc8e 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ lazy val `fundamentals-collections` = project.in(file("fundamentals/fundamentals ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test ) @@ -18,13 +18,10 @@ lazy val `fundamentals-collections` = project.in(file("fundamentals/fundamentals .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -39,7 +36,7 @@ lazy val `fundamentals-collections` = project.in(file("fundamentals/fundamentals ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -114,7 +111,7 @@ lazy val `fundamentals-collections` = project.in(file("fundamentals/fundamentals s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -154,7 +151,7 @@ lazy val `fundamentals-platform` = project.in(file("fundamentals/fundamentals-pl ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided @@ -163,13 +160,10 @@ lazy val `fundamentals-platform` = project.in(file("fundamentals/fundamentals-pl .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -184,7 +178,7 @@ lazy val `fundamentals-platform` = project.in(file("fundamentals/fundamentals-pl ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -259,7 +253,7 @@ lazy val `fundamentals-platform` = project.in(file("fundamentals/fundamentals-pl s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -278,7 +272,7 @@ lazy val `fundamentals-language` = project.in(file("fundamentals/fundamentals-la ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided @@ -287,13 +281,10 @@ lazy val `fundamentals-language` = project.in(file("fundamentals/fundamentals-la .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -308,7 +299,7 @@ lazy val `fundamentals-language` = project.in(file("fundamentals/fundamentals-la ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -383,7 +374,7 @@ lazy val `fundamentals-language` = project.in(file("fundamentals/fundamentals-la s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -423,7 +414,7 @@ lazy val `fundamentals-reflection` = project.in(file("fundamentals/fundamentals- ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "dev.zio" %% "izumi-reflect" % V.izumi_reflect, @@ -433,13 +424,10 @@ lazy val `fundamentals-reflection` = project.in(file("fundamentals/fundamentals- .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -454,7 +442,7 @@ lazy val `fundamentals-reflection` = project.in(file("fundamentals/fundamentals- ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -529,7 +517,7 @@ lazy val `fundamentals-reflection` = project.in(file("fundamentals/fundamentals- s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -565,7 +553,7 @@ lazy val `fundamentals-reflection` = project.in(file("fundamentals/fundamentals- lazy val `fundamentals-functional` = project.in(file("fundamentals/fundamentals-functional")) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test ) @@ -573,13 +561,10 @@ lazy val `fundamentals-functional` = project.in(file("fundamentals/fundamentals- .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -594,7 +579,7 @@ lazy val `fundamentals-functional` = project.in(file("fundamentals/fundamentals- ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -669,7 +654,7 @@ lazy val `fundamentals-functional` = project.in(file("fundamentals/fundamentals- s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -689,7 +674,7 @@ lazy val `fundamentals-bio` = project.in(file("fundamentals/fundamentals-bio")) ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats % Optional, @@ -708,13 +693,10 @@ lazy val `fundamentals-bio` = project.in(file("fundamentals/fundamentals-bio")) .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -729,7 +711,7 @@ lazy val `fundamentals-bio` = project.in(file("fundamentals/fundamentals-bio")) ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -804,7 +786,7 @@ lazy val `fundamentals-bio` = project.in(file("fundamentals/fundamentals-bio")) s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -823,7 +805,7 @@ lazy val `fundamentals-json-circe` = project.in(file("fundamentals/fundamentals- ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "io.circe" %% "circe-core" % V.circe, @@ -836,13 +818,10 @@ lazy val `fundamentals-json-circe` = project.in(file("fundamentals/fundamentals- .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -857,7 +836,7 @@ lazy val `fundamentals-json-circe` = project.in(file("fundamentals/fundamentals- ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -932,7 +911,7 @@ lazy val `fundamentals-json-circe` = project.in(file("fundamentals/fundamentals- s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -948,7 +927,7 @@ lazy val `fundamentals-json-circe` = project.in(file("fundamentals/fundamentals- lazy val `fundamentals-orphans` = project.in(file("fundamentals/fundamentals-orphans")) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats % Optional, @@ -963,13 +942,10 @@ lazy val `fundamentals-orphans` = project.in(file("fundamentals/fundamentals-orp .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -984,7 +960,7 @@ lazy val `fundamentals-orphans` = project.in(file("fundamentals/fundamentals-orp ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1059,7 +1035,7 @@ lazy val `fundamentals-orphans` = project.in(file("fundamentals/fundamentals-orp s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1075,7 +1051,7 @@ lazy val `fundamentals-orphans` = project.in(file("fundamentals/fundamentals-orp lazy val `fundamentals-literals` = project.in(file("fundamentals/fundamentals-literals")) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided @@ -1084,13 +1060,10 @@ lazy val `fundamentals-literals` = project.in(file("fundamentals/fundamentals-li .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -1105,7 +1078,7 @@ lazy val `fundamentals-literals` = project.in(file("fundamentals/fundamentals-li ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1180,7 +1153,7 @@ lazy val `fundamentals-literals` = project.in(file("fundamentals/fundamentals-li s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1200,7 +1173,7 @@ lazy val `distage-core-api` = project.in(file("distage/distage-core-api")) ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats % Optional, @@ -1218,13 +1191,10 @@ lazy val `distage-core-api` = project.in(file("distage/distage-core-api")) .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -1239,7 +1209,7 @@ lazy val `distage-core-api` = project.in(file("distage/distage-core-api")) ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1314,7 +1284,7 @@ lazy val `distage-core-api` = project.in(file("distage/distage-core-api")) s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1333,7 +1303,7 @@ lazy val `distage-core-proxy-cglib` = project.in(file("distage/distage-core-prox ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "cglib" % "cglib-nodep" % V.cglib_nodep @@ -1342,13 +1312,10 @@ lazy val `distage-core-proxy-cglib` = project.in(file("distage/distage-core-prox .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -1363,7 +1330,7 @@ lazy val `distage-core-proxy-cglib` = project.in(file("distage/distage-core-prox ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1438,7 +1405,7 @@ lazy val `distage-core-proxy-cglib` = project.in(file("distage/distage-core-prox s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1458,7 +1425,7 @@ lazy val `distage-core` = project.in(file("distage/distage-core")) ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats % Optional, @@ -1474,13 +1441,10 @@ lazy val `distage-core` = project.in(file("distage/distage-core")) .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -1495,7 +1459,7 @@ lazy val `distage-core` = project.in(file("distage/distage-core")) ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1570,7 +1534,7 @@ lazy val `distage-core` = project.in(file("distage/distage-core")) s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1590,7 +1554,7 @@ lazy val `distage-extension-config` = project.in(file("distage/distage-extension ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "com.github.pureconfig" %% "pureconfig-magnolia" % V.pureconfig, @@ -1601,13 +1565,10 @@ lazy val `distage-extension-config` = project.in(file("distage/distage-extension .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -1622,7 +1583,7 @@ lazy val `distage-extension-config` = project.in(file("distage/distage-extension ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1697,7 +1658,7 @@ lazy val `distage-extension-config` = project.in(file("distage/distage-extension s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1739,7 +1700,7 @@ lazy val `distage-extension-plugins` = project.in(file("distage/distage-extensio ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "io.github.classgraph" % "classgraph" % V.classgraph, @@ -1749,13 +1710,10 @@ lazy val `distage-extension-plugins` = project.in(file("distage/distage-extensio .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -1770,7 +1728,7 @@ lazy val `distage-extension-plugins` = project.in(file("distage/distage-extensio ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1845,7 +1803,7 @@ lazy val `distage-extension-plugins` = project.in(file("distage/distage-extensio s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1867,7 +1825,7 @@ lazy val `distage-extension-logstage` = project.in(file("distage/distage-extensi ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test ) @@ -1875,13 +1833,10 @@ lazy val `distage-extension-logstage` = project.in(file("distage/distage-extensi .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -1896,7 +1851,7 @@ lazy val `distage-extension-logstage` = project.in(file("distage/distage-extensi ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -1971,7 +1926,7 @@ lazy val `distage-extension-logstage` = project.in(file("distage/distage-extensi s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -1990,7 +1945,7 @@ lazy val `distage-framework-api` = project.in(file("distage/distage-framework-ap ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided @@ -1999,13 +1954,10 @@ lazy val `distage-framework-api` = project.in(file("distage/distage-framework-ap .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2020,7 +1972,7 @@ lazy val `distage-framework-api` = project.in(file("distage/distage-framework-ap ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -2095,7 +2047,7 @@ lazy val `distage-framework-api` = project.in(file("distage/distage-framework-ap s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -2120,7 +2072,7 @@ lazy val `distage-framework` = project.in(file("distage/distage-framework")) ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats % Optional, @@ -2136,13 +2088,10 @@ lazy val `distage-framework` = project.in(file("distage/distage-framework")) .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2157,7 +2106,7 @@ lazy val `distage-framework` = project.in(file("distage/distage-framework")) ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -2232,7 +2181,7 @@ lazy val `distage-framework` = project.in(file("distage/distage-framework")) s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -2275,7 +2224,7 @@ lazy val `distage-framework-docker` = project.in(file("distage/distage-framework ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats % Test, @@ -2290,13 +2239,10 @@ lazy val `distage-framework-docker` = project.in(file("distage/distage-framework .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2311,7 +2257,7 @@ lazy val `distage-framework-docker` = project.in(file("distage/distage-framework ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -2386,7 +2332,7 @@ lazy val `distage-framework-docker` = project.in(file("distage/distage-framework s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -2405,7 +2351,7 @@ lazy val `distage-testkit-core` = project.in(file("distage/distage-testkit-core" ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test ) @@ -2413,13 +2359,10 @@ lazy val `distage-testkit-core` = project.in(file("distage/distage-testkit-core" .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2434,7 +2377,7 @@ lazy val `distage-testkit-core` = project.in(file("distage/distage-testkit-core" ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -2509,7 +2452,7 @@ lazy val `distage-testkit-core` = project.in(file("distage/distage-testkit-core" s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -2531,7 +2474,7 @@ lazy val `distage-testkit-scalatest` = project.in(file("distage/distage-testkit- ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats % Optional, @@ -2547,13 +2490,10 @@ lazy val `distage-testkit-scalatest` = project.in(file("distage/distage-testkit- .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2568,7 +2508,7 @@ lazy val `distage-testkit-scalatest` = project.in(file("distage/distage-testkit- ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -2643,7 +2583,7 @@ lazy val `distage-testkit-scalatest` = project.in(file("distage/distage-testkit- s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -2663,7 +2603,7 @@ lazy val `logstage-core` = project.in(file("logstage/logstage-core")) ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided, @@ -2676,13 +2616,10 @@ lazy val `logstage-core` = project.in(file("logstage/logstage-core")) .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2697,7 +2634,7 @@ lazy val `logstage-core` = project.in(file("logstage/logstage-core")) ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -2772,7 +2709,7 @@ lazy val `logstage-core` = project.in(file("logstage/logstage-core")) s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -2792,7 +2729,7 @@ lazy val `logstage-rendering-circe` = project.in(file("logstage/logstage-renderi ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "jawn-parser" % V.jawn % Test, @@ -2803,13 +2740,10 @@ lazy val `logstage-rendering-circe` = project.in(file("logstage/logstage-renderi .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2824,7 +2758,7 @@ lazy val `logstage-rendering-circe` = project.in(file("logstage/logstage-renderi ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -2899,7 +2833,7 @@ lazy val `logstage-rendering-circe` = project.in(file("logstage/logstage-renderi s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -2918,7 +2852,7 @@ lazy val `logstage-adapter-slf4j` = project.in(file("logstage/logstage-adapter-s ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.slf4j" % "slf4j-api" % V.slf4j @@ -2927,13 +2861,10 @@ lazy val `logstage-adapter-slf4j` = project.in(file("logstage/logstage-adapter-s .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -2948,7 +2879,7 @@ lazy val `logstage-adapter-slf4j` = project.in(file("logstage/logstage-adapter-s ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -3023,7 +2954,7 @@ lazy val `logstage-adapter-slf4j` = project.in(file("logstage/logstage-adapter-s s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -3045,7 +2976,7 @@ lazy val `logstage-sink-slf4j` = project.in(file("logstage/logstage-sink-slf4j") ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.slf4j" % "slf4j-api" % V.slf4j, @@ -3055,13 +2986,10 @@ lazy val `logstage-sink-slf4j` = project.in(file("logstage/logstage-sink-slf4j") .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -3076,7 +3004,7 @@ lazy val `logstage-sink-slf4j` = project.in(file("logstage/logstage-sink-slf4j") ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -3151,7 +3079,7 @@ lazy val `logstage-sink-slf4j` = project.in(file("logstage/logstage-sink-slf4j") s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -3193,7 +3121,7 @@ lazy val `microsite` = project.in(file("doc/microsite")) ) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test, "org.typelevel" %% "cats-core" % V.cats, @@ -3210,13 +3138,10 @@ lazy val `microsite` = project.in(file("doc/microsite")) .settings( crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, - coverageEnabled := { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => false - case (_, _) => coverageEnabled.value - } }, + coverageEnabled := false, organization := "io.7mind.izumi", Compile / unmanagedSourceDirectories += baseDirectory.value / ".jvm/src/main/scala" , Compile / unmanagedResourceDirectories += baseDirectory.value / ".jvm/src/main/resources" , @@ -3231,7 +3156,7 @@ lazy val `microsite` = project.in(file("doc/microsite")) ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -3306,7 +3231,7 @@ lazy val `microsite` = project.in(file("doc/microsite")) s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -3383,14 +3308,14 @@ lazy val `microsite` = project.in(file("doc/microsite")) lazy val `sbt-izumi-deps` = project.in(file("sbt-plugins/sbt-izumi-deps")) .settings( libraryDependencies ++= Seq( - compilerPlugin("org.typelevel" % "kind-projector_2.13.5" % V.kind_projector), + compilerPlugin("org.typelevel" % "kind-projector" % V.kind_projector cross CrossVersion.full), "org.scala-lang.modules" %% "scala-collection-compat" % V.collection_compat, "org.scalatest" %% "scalatest" % V.scalatest % Test ) ) .settings( crossScalaVersions := Seq( - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head, coverageEnabled := false, @@ -3408,7 +3333,7 @@ lazy val `sbt-izumi-deps` = project.in(file("sbt-plugins/sbt-izumi-deps")) ), Test / testOptions += Tests.Argument("-oDF"), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (_, "2.12.14-bin-SNAPSHOT") => Seq( + case (_, "2.12.14") => Seq( "-Xsource:2.13", "-Ypartial-unification", if (insideCI.value) "-Wconf:any:error" else "-Wconf:any:warning", @@ -3483,7 +3408,7 @@ lazy val `sbt-izumi-deps` = project.in(file("sbt-plugins/sbt-izumi-deps")) s"-Xmacro-settings:is-ci=${insideCI.value}" ), scalacOptions ++= { (isSnapshot.value, scalaVersion.value) match { - case (false, "2.12.14-bin-SNAPSHOT") => Seq( + case (false, "2.12.14") => Seq( "-opt:l:inline", "-opt-inline-from:izumi.**" ) @@ -3503,7 +3428,7 @@ lazy val `fundamentals` = (project in file(".agg/fundamentals-fundamentals")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3525,7 +3450,7 @@ lazy val `fundamentals-jvm` = (project in file(".agg/fundamentals-fundamentals-j publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3547,7 +3472,7 @@ lazy val `distage` = (project in file(".agg/distage-distage")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3571,7 +3496,7 @@ lazy val `distage-jvm` = (project in file(".agg/distage-distage-jvm")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3595,7 +3520,7 @@ lazy val `logstage` = (project in file(".agg/logstage-logstage")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3612,7 +3537,7 @@ lazy val `logstage-jvm` = (project in file(".agg/logstage-logstage-jvm")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3629,7 +3554,7 @@ lazy val `doc` = (project in file(".agg/doc-doc")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3643,7 +3568,7 @@ lazy val `doc-jvm` = (project in file(".agg/doc-doc-jvm")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) @@ -3656,7 +3581,7 @@ lazy val `sbt-plugins` = (project in file(".agg/sbt-plugins-sbt-plugins")) .settings( publish / skip := true, crossScalaVersions := Nil, - scalaVersion := "2.12.14-bin-SNAPSHOT" + scalaVersion := "2.12.14" ) .disablePlugins(AssemblyPlugin) .aggregate( @@ -3667,7 +3592,7 @@ lazy val `sbt-plugins-jvm` = (project in file(".agg/sbt-plugins-sbt-plugins-jvm" .settings( publish / skip := true, crossScalaVersions := Nil, - scalaVersion := "2.12.14-bin-SNAPSHOT" + scalaVersion := "2.12.14" ) .disablePlugins(AssemblyPlugin) .aggregate( @@ -3679,7 +3604,7 @@ lazy val `izumi-jvm` = (project in file(".agg/.agg-jvm")) publish / skip := true, crossScalaVersions := Seq( "2.13.6", - "2.12.14-bin-SNAPSHOT" + "2.12.14" ), scalaVersion := crossScalaVersions.value.head ) diff --git a/project/Deps.sc b/project/Deps.sc index 59ac6cce3d..36376e5cd5 100644 --- a/project/Deps.sc +++ b/project/Deps.sc @@ -104,7 +104,8 @@ object Izumi { final val cglib_nodep = Library("cglib", "cglib-nodep", V.cglib_nodep, LibraryType.Invariant) in Scope.Compile.jvm() - final val projector = Library("org.typelevel", "kind-projector_2.13.5", V.kind_projector, LibraryType.Invariant) + final val projector = Library("org.typelevel", "kind-projector", V.kind_projector, LibraryType.Invariant) + .more(LibSetting.Raw("cross CrossVersion.full")) final val fast_classpath_scanner = Library("io.github.classgraph", "classgraph", V.classgraph, LibraryType.Invariant) in Scope.Compile.jvm final val scala_java_time = Library("io.github.cquiroz", "scala-java-time", V.scala_java_time, LibraryType.Auto) @@ -127,7 +128,7 @@ object Izumi { import Deps._ // DON'T REMOVE, these variables are read from CI build (build.sh) - final val scala212 = ScalaVersion("2.12.14-bin-SNAPSHOT") + final val scala212 = ScalaVersion("2.12.14") final val scala213 = ScalaVersion("2.13.6") object Groups {