Merge remote-tracking branch 'origin/main' into upgradathon

davenverse · Jul 25, 2024 · 18d2174 · 18d2174
2 parents 03e00c0 + 4a5cfdf
commit 18d2174
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git 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.17, 2.13.10, 3.4.2]
         java: [temurin@8]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -110,7 +110,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.2.2]
+        scala: [3.4.2]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -207,32 +207,32 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.2, rootJS)
+      - name: Download target directories (3.4.2, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootJS
 
-      - name: Inflate target directories (3.2.2, rootJS)
+      - name: Inflate target directories (3.4.2, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.2, rootJVM)
+      - name: Download target directories (3.4.2, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootJVM
 
-      - name: Inflate target directories (3.2.2, rootJVM)
+      - name: Inflate target directories (3.4.2, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.2, rootNative)
+      - name: Download target directories (3.4.2, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootNative
 
-      - name: Inflate target directories (3.2.2, rootNative)
+      - name: Inflate target directories (3.4.2, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar
@@ -256,7 +256,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.2.2]
+        scala: [3.4.2]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / tlBaseVersion := "0.4" // your current series x.y
+ThisBuild / tlBaseVersion := "0.5" // your current series x.y
 
 ThisBuild / organization := "io.chrisdavenport"
 ThisBuild / organizationName := "Christopher Davenport"
@@ -20,7 +20,7 @@ val circeV = "0.14.8"
 
 ThisBuild / testFrameworks += new TestFramework("munit.Framework")
 
-ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.14", "3.3.3")
+ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.14", "3.4.2")
 
 // Projects
 lazy val `rediculous-concurrent` = tlCrossRootProject
@@ -40,7 +40,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       "io.circe"                    %%% "circe-core"                 % circeV,
       "io.circe"                    %%% "circe-parser"               % circeV,
 
-      "io.chrisdavenport"           %%% "rediculous"                 % "0.5.0",
+      "io.chrisdavenport"           %%% "rediculous"                 % "0.6.0-M1",
       "io.chrisdavenport"           %%% "circuit"                    % "0.5.1",
       "io.chrisdavenport"           %%% "mules"                      % "0.7.0",
       "io.chrisdavenport"           %%% "single-fibered"             % "0.1.1",
@@ -96,5 +96,3 @@ lazy val examples = crossProject(JVMPlatform, JSPlatform, NativePlatform)
 lazy val site = project.in(file("site"))
   .enablePlugins(TypelevelSitePlugin)
   .dependsOn(core.jvm)
-
-