Merge pull request #29 from davenverse/someMoreUpgrades

Some more upgrades
davenverse · Apr 13, 2023 · 5b25775 · 5b25775
2 parents bbc9edb + c361a18
commit 5b25775
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 34 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.14, 2.13.8, 3.2.2]
+        scala: [2.12.17, 2.13.10, 3.2.2]
         java: [temurin@8]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -90,11 +90,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p http4s/.jvm/target http4s/.js/target examples/target target .js/target core/native/target site/target core/js/target core/jvm/target .jvm/target .native/target project/target
+        run: mkdir -p http4s/.jvm/target http4s/.js/target examples/.native/target target .js/target core/native/target site/target core/js/target examples/.js/target core/jvm/target .jvm/target .native/target examples/.jvm/target http4s/.native/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar http4s/.jvm/target http4s/.js/target examples/target target .js/target core/native/target site/target core/js/target core/jvm/target .jvm/target .native/target project/target
+        run: tar cf targets.tar http4s/.jvm/target http4s/.js/target examples/.native/target target .js/target core/native/target site/target core/js/target examples/.js/target core/jvm/target .jvm/target .native/target examples/.jvm/target http4s/.native/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -147,62 +147,62 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.14, rootJS)
+      - name: Download target directories (2.12.17, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.14-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS
 
-      - name: Inflate target directories (2.12.14, rootJS)
+      - name: Inflate target directories (2.12.17, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.14, rootJVM)
+      - name: Download target directories (2.12.17, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.14-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM
 
-      - name: Inflate target directories (2.12.14, rootJVM)
+      - name: Inflate target directories (2.12.17, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.14, rootNative)
+      - name: Download target directories (2.12.17, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.14-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative
 
-      - name: Inflate target directories (2.12.14, rootNative)
+      - name: Inflate target directories (2.12.17, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.8, rootJS)
+      - name: Download target directories (2.13.10, rootJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS
 
-      - name: Inflate target directories (2.13.8, rootJS)
+      - name: Inflate target directories (2.13.10, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.8, rootJVM)
+      - name: Download target directories (2.13.10, rootJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM
 
-      - name: Inflate target directories (2.13.8, rootJVM)
+      - name: Inflate target directories (2.13.10, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.8, rootNative)
+      - name: Download target directories (2.13.10, rootNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative
 
-      - name: Inflate target directories (2.13.8, rootNative)
+      - name: Inflate target directories (2.13.10, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/.jvmopts b/.jvmopts
@@ -0,0 +1,6 @@
+-Dfile.encoding=UTF8
+-Xms1G
+-Xmx6G
+-XX:ReservedCodeCacheSize=250M
+-XX:+TieredCompilation
+-XX:+UseG1GC
diff --git a/build.sbt b/build.sbt
@@ -20,7 +20,7 @@ val circeV = "0.14.5"
 
 ThisBuild / testFrameworks += new TestFramework("munit.Framework")
 
-ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.8", "3.2.2")
+ThisBuild / crossScalaVersions := Seq("2.12.17", "2.13.10", "3.2.2")
 
 // Projects
 lazy val `rediculous-concurrent` = tlCrossRootProject
@@ -56,34 +56,41 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   ).jsSettings(
     scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)}
   ).jvmSettings(
-    libraryDependencies += "com.github.jnr" % "jnr-unixsocket" % "0.38.15" % Test,
+    libraryDependencies += "com.github.jnr" % "jnr-unixsocket" % "0.38.19" % Test,
   ).platformsSettings(JVMPlatform, JSPlatform)(
     libraryDependencies ++= Seq(
       "io.chrisdavenport"           %%% "whale-tail-manager"         % "0.0.9" % Test,
     )
   )
 
-lazy val http4s = crossProject(JVMPlatform, JSPlatform)
+lazy val http4s = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .in(file("http4s"))
   .dependsOn(core)
   .settings(
     name := "rediculous-concurrent-http4s",
     libraryDependencies ++= Seq(
-      "io.chrisdavenport" %%% "circuit-http4s-client" % "0.5.0",
+      "io.chrisdavenport" %%% "circuit-http4s-client" % "0.5.1",
     )
   )
 
 
-lazy val examples = project.in(file("examples"))
+lazy val examples = crossProject(JVMPlatform, JSPlatform, NativePlatform)
+  .crossType(CrossType.Pure)
+  .in(file("examples"))
   .disablePlugins(MimaPlugin)
-  .dependsOn(core.jvm, http4s.jvm)
+  .enablePlugins(NoPublishPlugin)
+  .dependsOn(core, http4s)
   .settings(
-    publish / skip := true,
     name := "rediculous-examples",
     libraryDependencies ++= Seq(
-      "org.http4s" %% "http4s-ember-client" % "0.23.12"
+      "org.http4s" %%% "http4s-ember-client" % "0.23.18",
+      "io.chrisdavenport" %%% "crossplatformioapp" % "0.1.0"
     )
+  ).jsSettings(
+    scalaJSUseMainModuleInitializer := true,
+    Compile / mainClass := Some("SingleFiberedExample"),
+    scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)},
   )
 
 lazy val site = project.in(file("site"))

diff --git a/examples/src/main/scala/SingleFiberedExample.scala b/examples/src/main/scala/SingleFiberedExample.scala
@@ -10,10 +10,10 @@ import com.comcast.ip4s._
 
 import io.chrisdavenport.rediculous.concurrent.RedisSingleFibered
 import io.chrisdavenport.rediculous.RedisCommands
+import io.chrisdavenport.crossplatformioapp.CrossPlatformIOApp
 
 
-
-object SingleFiberedExample extends IOApp {
+object SingleFiberedExample extends CrossPlatformIOApp {
 
   def action(name: String): IO[String] = {
     Ref[IO].of(0).flatMap{ ref =>

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
 addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.19")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.19")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.4.19")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.2.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
-addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0")
 addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.1.2")