diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2b1728..136c20b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,12 +22,12 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.1.3, 2.12.16, 2.13.8] + scala: [3.3.3, 2.12.19, 2.13.12] java: - - adopt@1.8 - - adopt@1.11 - - adopt@1.14 - - graalvm-ce-java8@20.2.0 + - adopt-hotspot@8 + - adopt-hotspot@11 + - adopt-hotspot@17 + - 'graal:20.2.0@8' runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -35,10 +35,33 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (adopt-hotspot@8) + if: matrix.java == 'adopt-hotspot@8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: adopt-hotspot + java-version: 8 + + - name: Setup Java (adopt-hotspot@11) + if: matrix.java == 'adopt-hotspot@11' + uses: actions/setup-java@v2 + with: + distribution: adopt-hotspot + java-version: 11 + + - name: Setup Java (adopt-hotspot@17) + if: matrix.java == 'adopt-hotspot@17' + uses: actions/setup-java@v2 + with: + distribution: adopt-hotspot + java-version: 17 + + - name: 'Setup GraalVM (graal:20.2.0@8)' + if: 'matrix.java == ''graal:20.2.0@8''' + uses: DeLaGuardo/setup-graalvm@5.0 + with: + graalvm: 20.2.0 + java: 8 - name: Cache sbt uses: actions/cache@v2 diff --git a/build.sbt b/build.sbt index 0beca36..77c1514 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ * limitations under the License. */ -ThisBuild / baseVersion := "1.2" +ThisBuild / baseVersion := "1.3" ThisBuild / organization := "org.typelevel" ThisBuild / organizationName := "Typelevel" @@ -24,9 +24,13 @@ ThisBuild / publishFullName := "Daniel Spiewak" ThisBuild / strictSemVer := false -ThisBuild / crossScalaVersions := Seq("3.1.3", "2.12.16", "2.13.8") +ThisBuild / crossScalaVersions := Seq("3.3.3", "2.12.19", "2.13.12") -ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11", "adopt@1.14", "graalvm-ce-java8@20.2.0") +ThisBuild / githubWorkflowJavaVersions := Seq( + JavaSpec(JavaSpec.Distribution.Adopt, "8"), + JavaSpec(JavaSpec.Distribution.Adopt, "11"), + JavaSpec(JavaSpec.Distribution.Adopt, "17"), + JavaSpec.graalvm("20.2.0", "8")) ThisBuild / homepage := Some(url("https://github.com/typelevel/coop")) @@ -41,8 +45,8 @@ lazy val root = project.in(file(".")).aggregate(core.jvm, core.js, core.native) lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(file("core")) .settings( name := "coop", - libraryDependencies += "org.specs2" %%% "specs2-core" % "4.16.0" % Test) + libraryDependencies += "org.specs2" %%% "specs2-core" % "4.20.8" % Test) .settings( libraryDependencies ++= Seq( - "org.typelevel" %%% "cats-free" % "2.8.0", - "org.typelevel" %%% "cats-mtl" % "1.3.0")) + "org.typelevel" %%% "cats-free" % "2.12.0", + "org.typelevel" %%% "cats-mtl" % "1.5.0")) diff --git a/project/build.properties b/project/build.properties index c8fcab5..ee4c672 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.10.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7fddc44..1d3efa0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") +addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13")