From c8449bb73eaee099c5f00a42990c85bafd815246 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Fri, 27 Jan 2023 00:28:05 +0000 Subject: [PATCH 1/3] Update sbt-scalajs, scalajs-library_2.13, ... to 1.13.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 6262cfa5ca..fb1cfd68bf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9") addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") From 89af35d9119f4a0c62de94cdac5c0b9437037b9f Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 31 Jan 2023 16:38:19 +0100 Subject: [PATCH 2/3] Disable 2.11 for JS & native --- .github/workflows/ci.yml | 5 +++ .mergify.yml | 10 ----- build.sbt | 91 ++++++++++++++++++++-------------------- project/plugins.sbt | 2 +- 4 files changed, 52 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa4df02cc6..ecc11e1b73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,11 @@ jobs: matrix: scala-version: [ "2.11", "2.12", "2.13", "3" ] target-platform: [ "JVM", "JS", "Native" ] + exclude: + - scala-version: "2.11" + target-platform: "JS" + - scala-version: "2.11" + target-platform: "Native" steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.mergify.yml b/.mergify.yml index 5f46798717..ababc04505 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,11 +10,9 @@ pull_request_rules: - check-success=ci (2.12, JVM) - check-success=ci (2.13, JVM) - check-success=ci (3, JVM) - - check-success=ci (2.11, JS) - check-success=ci (2.12, JS) - check-success=ci (2.13, JS) - check-success=ci (3, JS) - - check-success=ci (2.11, Native) - check-success=ci (2.12, Native) - check-success=ci (2.13, Native) - check-success=ci (3, Native) @@ -31,11 +29,9 @@ pull_request_rules: - check-success=ci (2.12, JVM) - check-success=ci (2.13, JVM) - check-success=ci (3, JVM) - - check-success=ci (2.11, JS) - check-success=ci (2.12, JS) - check-success=ci (2.13, JS) - check-success=ci (3, JS) - - check-success=ci (2.11, Native) - check-success=ci (2.12, Native) - check-success=ci (2.13, Native) - check-success=ci (3, Native) @@ -52,11 +48,9 @@ pull_request_rules: - check-success=ci (2.12, JVM) - check-success=ci (2.13, JVM) - check-success=ci (3, JVM) - - check-success=ci (2.11, JS) - check-success=ci (2.12, JS) - check-success=ci (2.13, JS) - check-success=ci (3, JS) - - check-success=ci (2.11, Native) - check-success=ci (2.12, Native) - check-success=ci (2.13, Native) - check-success=ci (3, Native) @@ -72,11 +66,9 @@ pull_request_rules: - check-success=ci (2.12, JVM) - check-success=ci (2.13, JVM) - check-success=ci (3, JVM) - - check-success=ci (2.11, JS) - check-success=ci (2.12, JS) - check-success=ci (2.13, JS) - check-success=ci (3, JS) - - check-success=ci (2.11, Native) - check-success=ci (2.12, Native) - check-success=ci (2.13, Native) - check-success=ci (3, Native) @@ -93,11 +85,9 @@ pull_request_rules: - check-success=ci (2.12, JVM) - check-success=ci (2.13, JVM) - check-success=ci (3, JVM) - - check-success=ci (2.11, JS) - check-success=ci (2.12, JS) - check-success=ci (2.13, JS) - check-success=ci (3, JS) - - check-success=ci (2.11, Native) - check-success=ci (2.12, Native) - check-success=ci (2.13, Native) - check-success=ci (3, Native) diff --git a/build.sbt b/build.sbt index 0558c8b6da..87b1257dc7 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,8 @@ val scala2_11 = "2.11.12" val scala2_12 = "2.12.17" val scala2_13 = "2.13.10" val scala2 = List(scala2_11, scala2_12, scala2_13) -val scala3 = List("3.2.1") +val scala2alive = List(scala2_12, scala2_13) +val scala3 = List("3.2.2") lazy val testServerPort = settingKey[Int]("Port to run the http test server on") lazy val startTestServer = taskKey[Unit]("Start a http server used by tests") @@ -154,8 +155,8 @@ val zio2Version = "2.0.6" val zio1InteropRsVersion = "1.3.12" val zio2InteropRsVersion = "2.0.0" -val sttpModelVersion = "1.5.4" -val sttpSharedVersion = "1.3.12" +val sttpModelVersion = "1.5.5" +val sttpSharedVersion = "1.3.13" val logback = "ch.qos.logback" % "logback-classic" % "1.4.5" @@ -288,7 +289,7 @@ lazy val testServer = (projectMatrix in file("testing/server")) testServerPort := 51823, startTestServer := reStart.toTask("").value ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13)) + .jvmPlatform(scalaVersions = scala2alive) lazy val testServer2_13 = testServer.jvm(scala2_13) @@ -318,7 +319,7 @@ lazy val core = (projectMatrix in file("core")) } ) .jsPlatform( - scalaVersions = scala2 ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = { commonJsSettings ++ commonJsBackendSettings ++ browserChromeTestSettings ++ versioningSchemeSettings ++ List( Test / publishArtifact := true @@ -326,7 +327,7 @@ lazy val core = (projectMatrix in file("core")) } ) .nativePlatform( - scalaVersions = scala2 ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = { commonNativeSettings ++ versioningSchemeSettings ++ List( Test / publishArtifact := true @@ -362,7 +363,7 @@ lazy val catsCe2 = (projectMatrix in file("effects/cats-ce2")) settings = commonJvmSettings ) .jsPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJsSettings ++ commonJsBackendSettings ++ browserChromeTestSettings ++ testServerSettings ) @@ -379,15 +380,15 @@ lazy val cats = (projectMatrix in file("effects/cats")) .settings(testServerSettings) .dependsOn(core % compileAndTest) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJvmSettings ) .jsPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJsSettings ++ commonJsBackendSettings ++ browserChromeTestSettings ++ testServerSettings ) .nativePlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonNativeSettings ) @@ -403,7 +404,7 @@ lazy val fs2Ce2 = (projectMatrix in file("effects/fs2-ce2")) .settings(testServerSettings) .dependsOn(core % compileAndTest, catsCe2 % compileAndTest) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJvmSettings ++ Seq( libraryDependencies ++= dependenciesFor(scalaVersion.value)( "co.fs2" %%% "fs2-reactive-streams" % fs2_2_version(_), @@ -411,7 +412,7 @@ lazy val fs2Ce2 = (projectMatrix in file("effects/fs2-ce2")) ) ) ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) lazy val fs2 = (projectMatrix in file("effects/fs2")) .settings( @@ -425,7 +426,7 @@ lazy val fs2 = (projectMatrix in file("effects/fs2")) .settings(testServerSettings) .dependsOn(core % compileAndTest, cats % compileAndTest) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJvmSettings ++ Seq( libraryDependencies ++= Seq( "co.fs2" %%% "fs2-reactive-streams" % fs2_3_version, @@ -433,8 +434,8 @@ lazy val fs2 = (projectMatrix in file("effects/fs2")) ) ) ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) - .nativePlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonNativeSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) + .nativePlatform(scalaVersions = scala2alive ++ scala3, settings = commonNativeSettings) lazy val monix = (projectMatrix in file("effects/monix")) .settings( @@ -448,13 +449,13 @@ lazy val monix = (projectMatrix in file("effects/monix")) .settings(testServerSettings) .dependsOn(core % compileAndTest) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJvmSettings ++ List( libraryDependencies ++= Seq("io.monix" %% "monix-nio" % "0.1.0") ) ) .jsPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJsSettings ++ commonJsBackendSettings ++ browserChromeTestSettings ++ testServerSettings ) @@ -471,7 +472,7 @@ lazy val zio1 = (projectMatrix in file("effects/zio1")) .settings(testServerSettings) .dependsOn(core % compileAndTest) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJvmSettings ++ Seq( libraryDependencies ++= Seq( "dev.zio" %% "zio-interop-reactivestreams" % zio1InteropRsVersion, @@ -480,7 +481,7 @@ lazy val zio1 = (projectMatrix in file("effects/zio1")) ) ) .jsPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJsSettings ++ commonJsBackendSettings ++ browserChromeTestSettings ++ testServerSettings ) @@ -505,7 +506,7 @@ lazy val zio = (projectMatrix in file("effects/zio")) ) ) .jsPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJsSettings ++ commonJsBackendSettings ++ browserChromeTestSettings ++ testServerSettings ) @@ -538,7 +539,7 @@ lazy val akkaHttpBackend = (projectMatrix in file("akka-http-backend")) ) .dependsOn(core % compileAndTest) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) + scalaVersions = scala2alive ) //-- async http client @@ -564,7 +565,7 @@ def asyncHttpClientBackendProject(proj: String, includeDotty: Boolean = false, i .dependsOn(asyncHttpClientBackend % compileAndTest) .jvmPlatform( scalaVersions = - (if (include2_11) List(scala2_11) else Nil) ++ List(scala2_12, scala2_13) ++ (if (includeDotty) scala3 else Nil) + (if (include2_11) List(scala2_11) else Nil) ++ scala2alive ++ (if (includeDotty) scala3 else Nil) ) } @@ -646,7 +647,7 @@ def okhttpBackendProject(proj: String, includeDotty: Boolean) = { .settings(commonJvmSettings) .settings(testServerSettings) .settings(name := s"okhttp-backend-$proj") - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13) ++ (if (includeDotty) scala3 else Nil)) + .jvmPlatform(scalaVersions = scala2alive ++ (if (includeDotty) scala3 else Nil)) .dependsOn(okhttpBackend) } @@ -665,7 +666,7 @@ lazy val http4sCe2Backend = (projectMatrix in file("http4s-ce2-backend")) "org.http4s" %% "http4s-blaze-client" % http4s_ce2_version % Optional ) ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13)) + .jvmPlatform(scalaVersions = scala2alive) .dependsOn(catsCe2 % compileAndTest, core % compileAndTest, fs2Ce2 % compileAndTest) lazy val http4sBackend = (projectMatrix in file("http4s-backend")) @@ -679,7 +680,7 @@ lazy val http4sBackend = (projectMatrix in file("http4s-backend")) ), evictionErrorLevel := Level.Info ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3) + .jvmPlatform(scalaVersions = scala2alive ++ scala3) .dependsOn(cats % compileAndTest, core % compileAndTest, fs2 % compileAndTest) //-- finagle backend @@ -692,7 +693,7 @@ lazy val finagleBackend = (projectMatrix in file("finagle-backend")) "com.twitter" %% "finagle-http" % "22.12.0" ) ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13)) + .jvmPlatform(scalaVersions = scala2alive) .dependsOn(core % compileAndTest) lazy val armeriaBackend = (projectMatrix in file("armeria-backend")) @@ -702,7 +703,7 @@ lazy val armeriaBackend = (projectMatrix in file("armeria-backend")) name := "armeria-backend", libraryDependencies += "com.linecorp.armeria" % "armeria" % "1.21.0" ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3) + .jvmPlatform(scalaVersions = scala2alive ++ scala3) .dependsOn(core % compileAndTest) def armeriaBackendProject(proj: String, includeDotty: Boolean = false) = @@ -712,7 +713,7 @@ def armeriaBackendProject(proj: String, includeDotty: Boolean = false) = .settings(name := s"armeria-backend-$proj") .dependsOn(armeriaBackend % compileAndTest) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ (if (includeDotty) scala3 else Nil) + scalaVersions = scala2alive ++ (if (includeDotty) scala3 else Nil) ) lazy val armeriaMonixBackend = @@ -772,8 +773,8 @@ lazy val jsonCommon = (projectMatrix in (file("json/common"))) scalaVersions = scala2 ++ scala3, settings = commonJvmSettings ) - .jsPlatform(scalaVersions = scala2 ++ scala3, settings = commonJsSettings) - .nativePlatform(scalaVersions = scala2 ++ scala3, settings = commonNativeSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) + .nativePlatform(scalaVersions = scala2alive ++ scala3, settings = commonNativeSettings) .dependsOn(core) lazy val circe = (projectMatrix in file("json/circe")) @@ -801,7 +802,7 @@ lazy val circe = (projectMatrix in file("json/circe")) scalaVersions = scala2 ++ scala3, settings = commonJvmSettings ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) .dependsOn(core, jsonCommon) lazy val jsoniter = (projectMatrix in file("json/jsoniter")) @@ -817,7 +818,7 @@ lazy val jsoniter = (projectMatrix in file("json/jsoniter")) scalaVersions = scala2 ++ scala3, settings = commonJvmSettings ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) .dependsOn(core, jsonCommon) lazy val zioJson = (projectMatrix in file("json/zio-json")) @@ -833,7 +834,7 @@ lazy val zioJson = (projectMatrix in file("json/zio-json")) scalaVersions = Seq(scala2_12, scala2_13) ++ scala3, settings = commonJvmSettings ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) .dependsOn(core, jsonCommon) lazy val zio1Json = (projectMatrix in file("json/zio1-json")) @@ -849,7 +850,7 @@ lazy val zio1Json = (projectMatrix in file("json/zio1-json")) scalaVersions = Seq(scala2_12, scala2_13) ++ scala3, settings = commonJvmSettings ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) .dependsOn(core, jsonCommon) lazy val upickle = (projectMatrix in file("json/upickle")) @@ -863,11 +864,11 @@ lazy val upickle = (projectMatrix in file("json/upickle")) Test / scalacOptions --= Seq("-Wconf:cat=other-match-analysis:error") ) .jvmPlatform( - scalaVersions = List(scala2_12, scala2_13) ++ scala3, + scalaVersions = scala2alive ++ scala3, settings = commonJvmSettings ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) - .nativePlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonNativeSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) + .nativePlatform(scalaVersions = scala2alive ++ scala3, settings = commonNativeSettings) .dependsOn(core, jsonCommon) lazy val json4sVersion = "4.0.6" @@ -909,7 +910,7 @@ lazy val playJson = (projectMatrix in file("json/play-json")) scalaVersions = scala2, settings = commonJvmSettings ) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13), settings = commonJsSettings) + .jsPlatform(scalaVersions = scala2alive, settings = commonJsSettings) .dependsOn(core, jsonCommon) lazy val prometheusBackend = (projectMatrix in file("observability/prometheus-backend")) @@ -934,7 +935,7 @@ lazy val openTelemetryMetricsBackend = (projectMatrix in file("observability/ope ), scalaTest ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3) + .jvmPlatform(scalaVersions = scala2alive ++ scala3) .dependsOn(core) lazy val openTelemetryTracingZio1Backend = (projectMatrix in file("observability/opentelemetry-tracing-zio1-backend")) @@ -948,7 +949,7 @@ lazy val openTelemetryTracingZio1Backend = (projectMatrix in file("observability ), scalaTest ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3) + .jvmPlatform(scalaVersions = scala2alive ++ scala3) .dependsOn(zio1 % compileAndTest) .dependsOn(core) @@ -961,7 +962,7 @@ lazy val openTelemetryTracingZioBackend = (projectMatrix in file("observability/ "io.opentelemetry" % "opentelemetry-sdk-testing" % openTelemetryVersion % Test ) ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3) + .jvmPlatform(scalaVersions = scala2alive ++ scala3) .dependsOn(zio % compileAndTest) .dependsOn(core) @@ -974,9 +975,9 @@ lazy val scribeBackend = (projectMatrix in file("logging/scribe")) ), scalaTest ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJvmSettings) - .jsPlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonJsSettings) - .nativePlatform(scalaVersions = List(scala2_12, scala2_13) ++ scala3, settings = commonNativeSettings) + .jvmPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJvmSettings) + .jsPlatform(scalaVersions = scala2alive ++ scala3, settings = commonJsSettings) + .nativePlatform(scalaVersions = scala2alive ++ scala3, settings = commonNativeSettings) .dependsOn(core) lazy val slf4jBackend = (projectMatrix in file("logging/slf4j")) @@ -1018,7 +1019,7 @@ lazy val examples = (projectMatrix in file("examples")) _ => logback ) ) - .jvmPlatform(scalaVersions = List(scala2_12, scala2_13)) + .jvmPlatform(scalaVersions = scala2alive) .dependsOn( core, asyncHttpClientZioBackend, diff --git a/project/plugins.sbt b/project/plugins.sbt index fb1cfd68bf..743e08e2f9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.10") addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0") From 64fb162070adc49373f4f57ed5fb32549e5a4baa Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 31 Jan 2023 16:43:52 +0100 Subject: [PATCH 3/3] Disable 2.11 for JS & native --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecc11e1b73..8521ba520f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,11 @@ jobs: matrix: scala-version: [ "2.11", "2.12", "2.13", "3" ] target-platform: [ "JVM", "JS", "Native" ] - exclude: - - scala-version: "2.11" - target-platform: "JS" - - scala-version: "2.11" - target-platform: "Native" + exclude: + - scala-version: "2.11" + target-platform: "JS" + - scala-version: "2.11" + target-platform: "Native" steps: - name: Checkout uses: actions/checkout@v2