Merge branch 'master' into update/sbt-jmh-0.4.5

ddworak · web-flow · commit 809047e183d4 · 2023-07-14T07:12:13.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,35 +29,25 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup Java (temurin@11)
         if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 11
+          cache: sbt
 
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
-
-      - name: Cache sbt
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+          cache: sbt
 
       - name: Cache Redis
         uses: actions/cache@v2
@@ -80,19 +70,10 @@ jobs:
         run: ./install-redis.sh
 
       - name: Check that workflows are up to date
-        run: sbt ++${{ matrix.scala }} githubWorkflowCheck
+        run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
       - name: Build project
-        run: sbt ++${{ matrix.scala }} test
-
-      - name: Compress target directories
-        run: tar cf targets.tar macros/target core/js/target benchmark/js/target core/target benchmark/target spring/target analyzer/target mongo/target redis/target hocon/target .js/target target jetty/target .jvm/target mongo/js/target project/target
-
-      - name: Upload target directories
-        uses: actions/upload-artifact@v2
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
-          path: targets.tar
+        run: sbt '++ ${{ matrix.scala }}' test
 
   publish:
     name: Publish Artifacts
@@ -106,59 +87,29 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup Java (temurin@11)
         if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 11
+          cache: sbt
 
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
-
-      - name: Cache sbt
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (2.13.11)
-        uses: actions/download-artifact@v2
-        with:
-          name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }}
-
-      - name: Inflate target directories (2.13.11)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
-      - name: Download target directories (2.12.18)
-        uses: actions/download-artifact@v2
-        with:
-          name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
-
-      - name: Inflate target directories (2.12.18)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
+          cache: sbt
 
       - env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-        run: sbt ++${{ matrix.scala }} ci-release
+        run: sbt ci-release
diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImplicitTypesTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImplicitTypesTest.scala
@@ -4,7 +4,7 @@ package analyzer
 import org.scalatest.funsuite.AnyFunSuite
 
 class ImplicitTypesTest extends AnyFunSuite with AnalyzerTest {
-  ignore("implicit definitions without explicit types should be rejected") {
+  test("implicit definitions without explicit types should be rejected") {
     assertErrors(2,
       """
         |object whatever {
diff --git a/project/Commons.scala b/project/Commons.scala
@@ -23,25 +23,24 @@ object Commons extends ProjectGroup("commons") {
   // option in IntelliJ's SBT settings.
   val forIdeaImport: Boolean = System.getProperty("idea.managed", "false").toBoolean && System.getProperty("idea.runid") == null
 
-  val collectionCompatVersion = "2.5.0"
-  val guavaVersion = "31.1-jre"
+  val collectionCompatVersion = "2.11.0"
+  val guavaVersion = "32.1.1-jre"
   val jsr305Version = "3.0.2"
-  val scalatestVersion = "3.2.12"
-  val scalatestplusScalacheckVersion = "3.2.12.0"
-  val scalacheckVersion = "1.16.0"
+  val scalatestVersion = "3.2.16"
+  val scalatestplusScalacheckVersion = "3.2.14.0"
+  val scalacheckVersion = "1.17.0"
   val jettyVersion = "9.4.51.v20230217"
-  val mongoVersion = "4.9.1"
+  val mongoVersion = "4.10.1"
   val springVersion = "5.3.28"
   val typesafeConfigVersion = "1.4.2"
   val commonsIoVersion = "1.3.2" // test only
   val scalaLoggingVersion = "3.9.5"
   val akkaVersion = "2.6.19"
   val monixVersion = "3.4.1"
   val monixBioVersion = "1.2.0"
-  val mockitoVersion = "3.9.0"
-  val circeVersion = "0.13.0" // benchmark only
-  val upickleVersion = "1.3.11" // benchmark only
-  val scalajsBenchmarkVersion = "0.9.0"
+  val circeVersion = "0.14.5" // benchmark only
+  val upickleVersion = "3.1.2" // benchmark only
+  val scalajsBenchmarkVersion = "0.10.0"
   val slf4jVersion = "1.7.36"
 
   // for binary compatibility checking
@@ -80,6 +79,7 @@ object Commons extends ProjectGroup("commons") {
     githubWorkflowEnv ++= Map(
       "REDIS_VERSION" -> "6.2.12",
     ),
+    githubWorkflowArtifactUpload := false,
     githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17")),
     githubWorkflowBuildPreamble ++= Seq(
       WorkflowStep.Use(
@@ -161,7 +161,6 @@ object Commons extends ProjectGroup("commons") {
       "org.scalatest" %%% "scalatest" % scalatestVersion % Test,
       "org.scalacheck" %%% "scalacheck" % scalacheckVersion % Test,
       "org.scalatestplus" %%% "scalacheck-1-16" % scalatestplusScalacheckVersion % Test,
-      "org.mockito" % "mockito-core" % mockitoVersion % Test,
     ),
     ideBasePackages := Seq(organization.value),
     Compile / ideOutputDirectory := Some(target.value.getParentFile / "out/production"),
@@ -221,8 +220,6 @@ object Commons extends ProjectGroup("commons") {
           analyzer,
           macros,
           `core-js`,
-          benchmark,
-          `benchmark-js`,
           comprof,
         ),
     )
@@ -237,15 +234,13 @@ object Commons extends ProjectGroup("commons") {
       hocon,
       spring,
       redis,
-      benchmark,
     )
     .settings(aggregateProjectSettings)
 
   lazy val js = mkSubProject.in(file(".js"))
     .aggregate(
       `core-js`,
       `mongo-js`,
-      `benchmark-js`,
     )
     .settings(aggregateProjectSettings)
 
diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
 # suppress inspection "UnusedProperty"
-sbt.version=1.8.2
+sbt.version=1.8.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,15 +1,11 @@
-val scalaJSVersion: String =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.10.1")
-
 logLevel := Level.Warn
 
 addSbtPlugin("com.github.ghik" % "sbt-nosbt" % "0.2.1")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2")
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.2")
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8")
-addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3")
+addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.15.0")

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# suppress inspection "UnusedProperty"`
`2`		`-sbt.version=1.8.2`
	`2`	`+sbt.version=1.8.3`