diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9e605e8..aad13918 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.10, 3.2.2] + scala: [2.12.18, 2.13.12, 3.3.1] java: [temurin@8] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} @@ -114,7 +114,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.2.2] + scala: [3.3.1] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -151,92 +151,92 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.17, rootJS) + - name: Download target directories (2.12.18, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS - - name: Inflate target directories (2.12.17, rootJS) + - name: Inflate target directories (2.12.18, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootJVM) + - name: Download target directories (2.12.18, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM - - name: Inflate target directories (2.12.17, rootJVM) + - name: Inflate target directories (2.12.18, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootNative) + - name: Download target directories (2.12.18, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNative - - name: Inflate target directories (2.12.17, rootNative) + - name: Inflate target directories (2.12.18, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootJS) + - name: Download target directories (2.13.12, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJS - - name: Inflate target directories (2.13.10, rootJS) + - name: Inflate target directories (2.13.12, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootJVM) + - name: Download target directories (2.13.12, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootJVM - - name: Inflate target directories (2.13.10, rootJVM) + - name: Inflate target directories (2.13.12, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootNative) + - name: Download target directories (2.13.12, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12-rootNative - - name: Inflate target directories (2.13.10, rootNative) + - name: Inflate target directories (2.13.12, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJS) + - name: Download target directories (3.3.1, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootJS - - name: Inflate target directories (3.2.2, rootJS) + - name: Inflate target directories (3.3.1, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootJVM) + - name: Download target directories (3.3.1, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootJVM - - name: Inflate target directories (3.2.2, rootJVM) + - name: Inflate target directories (3.3.1, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.2, rootNative) + - name: Download target directories (3.3.1, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-rootNative - - name: Inflate target directories (3.2.2, rootNative) + - name: Inflate target directories (3.3.1, rootNative) run: | tar xf targets.tar rm targets.tar diff --git a/.scalafmt.conf b/.scalafmt.conf index 147538f0..68d92aa7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.3" +version = "3.7.14" style = default diff --git a/build.sbt b/build.sbt index 223aa60b..d7bdc5b7 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ ThisBuild / organizationName := "Scodec" ThisBuild / startYear := Some(2013) -ThisBuild / crossScalaVersions := Seq("2.12.17", "2.13.10", "3.2.2") +ThisBuild / crossScalaVersions := Seq("2.12.18", "2.13.12", "3.3.1") ThisBuild / tlVersionIntroduced := Map( "3" -> "1.1.27", @@ -96,7 +96,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) lazy val coreJVM = core.jvm .settings( libraryDependencies ++= Seq( - "com.google.guava" % "guava" % "31.1-jre" % "test" + "com.google.guava" % "guava" % "32.1.2-jre" % "test" ) ) diff --git a/project/build.properties b/project/build.properties index 46e43a97..72413de1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.8.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index fa351bdd..0c5cae23 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.3") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")