From cca213992471e6a996844810608ebe0731550d5a Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sat, 25 Apr 2026 17:56:28 -0500 Subject: [PATCH 1/9] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20dependencies=20?= =?UTF-8?q?on=20build.sbt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build.sbt b/build.sbt index 9b41f3d..358bed3 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import laika.config.* ThisBuild / tlBaseVersion := "0.0" ThisBuild / startYear := Some(2024) ThisBuild / licenses := Seq(License.Apache2) -ThisBuild / tlJdkRelease := Some(11) +ThisBuild / tlJdkRelease := Some(17) ThisBuild / developers := List( tlGitHubDev("ChristopherDavenport", "Christopher Davenport"), @@ -15,7 +15,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,19 +25,19 @@ 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" %% "alleycats-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", + "co.fs2" %% "fs2-scodec" % "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 + "org.typelevel" %% "weaver-cats" % "0.12.0" % Test, + "org.typelevel" %% "weaver-scalacheck" % "0.12.0" % Test ), mimaPreviousArtifacts := Set() ) From be01a390e6b99a8eb700ceab1672d68c613bf032 Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sat, 25 Apr 2026 17:57:01 -0500 Subject: [PATCH 2/9] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20TL,=20Scala=20J?= =?UTF-8?q?S=20and=20Native=20plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/plugins.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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") From 43ea6d18ff5d11b9c4a5cd4d54c83f234f569b6c Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sat, 25 Apr 2026 17:57:30 -0500 Subject: [PATCH 3/9] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20SBT=20to=20late?= =?UTF-8?q?st=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2f279155d92350daededad3be054f5b6c6c22d88 Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sat, 25 Apr 2026 17:59:58 -0500 Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=91=B7=20Update=20uses=20on=20CI=20co?= =?UTF-8?q?nfig=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 From 07f7e326fe22233f4fb135ad62ad17d58763924b Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sun, 3 May 2026 21:37:50 -0500 Subject: [PATCH 5/9] =?UTF-8?q?=F0=9F=94=A5=20Remove=20mima=20artifacts=20?= =?UTF-8?q?config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index 358bed3..745ec93 100644 --- a/build.sbt +++ b/build.sbt @@ -39,7 +39,6 @@ lazy val catscript = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.typelevel" %% "weaver-cats" % "0.12.0" % Test, "org.typelevel" %% "weaver-scalacheck" % "0.12.0" % Test ), - mimaPreviousArtifacts := Set() ) lazy val examples = project From f60a624df17a5776f77821184ff8b344c5623d96 Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sun, 3 May 2026 21:40:04 -0500 Subject: [PATCH 6/9] =?UTF-8?q?=E2=AC=87=EF=B8=8F=20Decrement=20minimum=20?= =?UTF-8?q?JDK=20version=20back=20to=2011?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 745ec93..eb2a315 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import laika.config.* ThisBuild / tlBaseVersion := "0.0" ThisBuild / startYear := Some(2024) ThisBuild / licenses := Seq(License.Apache2) -ThisBuild / tlJdkRelease := Some(17) +ThisBuild / tlJdkRelease := Some(11) ThisBuild / developers := List( tlGitHubDev("ChristopherDavenport", "Christopher Davenport"), From 0f4b178d1600ca71595a3bf1bff85c55ce076188 Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sun, 3 May 2026 21:46:17 -0500 Subject: [PATCH 7/9] =?UTF-8?q?=E2=9E=96=20Remove=20old=20dependency=20and?= =?UTF-8?q?=20move=20fs2-scodec=20interop=20to=20docs=20project?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index eb2a315..e6289ff 100644 --- a/build.sbt +++ b/build.sbt @@ -26,11 +26,9 @@ lazy val catscript = crossProject(JVMPlatform, JSPlatform, NativePlatform) name := "catscript", libraryDependencies ++= List( "org.typelevel" %% "cats-core" % "2.13.0", - "org.typelevel" %% "alleycats-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", - "co.fs2" %% "fs2-scodec" % "3.13.0", "org.scodec" %% "scodec-bits" % "1.2.4", "org.scodec" %% "scodec-core" % (if (scalaVersion.value.startsWith("2.")) "1.11.10" @@ -55,6 +53,7 @@ lazy val docs = project .enablePlugins(TypelevelSitePlugin) .dependsOn(catscript.jvm) .settings( + libraryDependencies += "co.fs2" %% "fs2-scodec" % "3.13.0", laikaConfig := LaikaConfig.defaults .withConfigValue( Selections( From e2ae73fb3ed016102d103427d34bf2f146bfd142 Mon Sep 17 00:00:00 2001 From: Hombre-x Date: Sun, 3 May 2026 21:48:57 -0500 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=8E=A8=20Remove=20spacing=20on=20.sbt?= =?UTF-8?q?=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sbt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index e6289ff..171411e 100644 --- a/build.sbt +++ b/build.sbt @@ -25,18 +25,18 @@ lazy val catscript = crossProject(JVMPlatform, JSPlatform, NativePlatform) .settings( name := "catscript", libraryDependencies ++= List( - "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.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.3"), // Testing "org.typelevel" %% "weaver-cats" % "0.12.0" % Test, "org.typelevel" %% "weaver-scalacheck" % "0.12.0" % Test - ), + ) ) lazy val examples = project From f083889e9efc1ae647dafea957cee5cb821a63e1 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 3 May 2026 23:51:19 -0400 Subject: [PATCH 9/9] Remove JDK release setting --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index 171411e..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"),