diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e44dfb3..097c501 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 @@ -45,7 +45,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 17 @@ -91,7 +91,7 @@ jobs: - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -107,7 +107,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 @@ -117,7 +117,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 17 @@ -128,7 +128,7 @@ jobs: run: sbt +update - name: Download target directories (2.13, rootJS) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS @@ -138,7 +138,7 @@ jobs: rm targets.tar - name: Download target directories (2.13, rootJVM) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM @@ -148,7 +148,7 @@ jobs: rm targets.tar - name: Download target directories (2.13, rootNative) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative @@ -158,7 +158,7 @@ jobs: rm targets.tar - name: Download target directories (3, rootJS) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS @@ -168,7 +168,7 @@ jobs: rm targets.tar - name: Download target directories (3, rootJVM) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM @@ -178,7 +178,7 @@ jobs: rm targets.tar - name: Download target directories (3, rootNative) - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative @@ -221,7 +221,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 @@ -231,7 +231,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 17 @@ -256,7 +256,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 @@ -266,7 +266,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: 17 diff --git a/build.sbt b/build.sbt index 9b41f3d..7ff4e2c 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,6 @@ import laika.config.* ThisBuild / tlBaseVersion := "0.0" ThisBuild / startYear := Some(2024) ThisBuild / licenses := Seq(License.Apache2) -ThisBuild / tlJdkRelease := Some(11) ThisBuild / developers := List( tlGitHubDev("ChristopherDavenport", "Christopher Davenport"), @@ -15,7 +14,7 @@ ThisBuild / developers := List( ThisBuild / tlSitePublishBranch := Some("main") ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) -ThisBuild / crossScalaVersions := Seq("2.13.15", "3.3.4") +ThisBuild / crossScalaVersions := Seq("2.13.18", "3.3.7") lazy val root = tlCrossRootProject.aggregate(catscript, examples) @@ -25,21 +24,18 @@ lazy val catscript = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "catscript", libraryDependencies ++= List( - "org.typelevel" %% "cats-core" % "2.12.0", - "org.typelevel" %% "alleycats-core" % "2.12.0", - "org.typelevel" %% "cats-effect" % "3.5.4", - "co.fs2" %% "fs2-core" % "3.10.2", - "co.fs2" %% "fs2-io" % "3.10.2", - "co.fs2" %% "fs2-scodec" % "3.10.2", - "org.scodec" %% "scodec-bits" % "1.2.0", + "org.typelevel" %% "cats-core" % "2.13.0", + "org.typelevel" %% "cats-effect" % "3.7.0", + "co.fs2" %% "fs2-core" % "3.13.0", + "co.fs2" %% "fs2-io" % "3.13.0", + "org.scodec" %% "scodec-bits" % "1.2.4", "org.scodec" %% "scodec-core" % (if (scalaVersion.value.startsWith("2.")) "1.11.10" - else "2.3.0"), + else "2.3.3"), // Testing - "com.disneystreaming" %% "weaver-cats" % "0.8.4" % Test, - "com.disneystreaming" %% "weaver-scalacheck" % "0.8.4" % Test - ), - mimaPreviousArtifacts := Set() + "org.typelevel" %% "weaver-cats" % "0.12.0" % Test, + "org.typelevel" %% "weaver-scalacheck" % "0.12.0" % Test + ) ) lazy val examples = project @@ -56,6 +52,7 @@ lazy val docs = project .enablePlugins(TypelevelSitePlugin) .dependsOn(catscript.jvm) .settings( + libraryDependencies += "co.fs2" %% "fs2-scodec" % "3.13.0", laikaConfig := LaikaConfig.defaults .withConfigValue( Selections( diff --git a/project/build.properties b/project/build.properties index 61c9b1c..df061f4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.1 +sbt.version=1.12.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 14b8009..22773d6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -val sbtTlVersion = "0.8.0" +val sbtTlVersion = "0.8.5" addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTlVersion) addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTlVersion) -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.11")