Merge branch 'master' into experimental-0.6

JD557 · Nov 13, 2023 · 5cbcde3 · 5cbcde3
2 parents b635e23 + 88812a9
commit 5cbcde3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/compile_test.yml b/.github/workflows/compile_test.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8 and SBT
+    - name: Set up Java 8 and SBT
       uses: actions/setup-java@v2
       with:
         distribution: temurin
@@ -60,11 +60,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8 and SBT
+    - name: Set up Java 17 and SBT
       uses: actions/setup-java@v2
       with:
         distribution: temurin
-        java-version: 8
+        java-version: 17
     - name: Cache Coursier
       uses: actions/cache@v1
       with:
@@ -103,7 +103,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8 and SBT
+    - name: Set up Java 8 and SBT
       uses: actions/setup-java@v2
       with:
         distribution: temurin

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.14
+version = 3.7.15
 
 runner.dialect = "scala3"
 align.preset = more

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("com.github.sbt"     % "sbt-release"                   % "1.1.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.14.0")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.15")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.16")
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"                  % "2.5.2")
 addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"                  % "3.9.21")
 addSbtPlugin("org.scoverage"      % "sbt-scoverage"                 % "2.0.9")
diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.6
+sbt.version = 1.9.7
diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt
@@ -2,4 +2,4 @@ addSbtPlugin("com.eed3si9n"       % "sbt-assembly"                  % "0.15.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.14.0")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.15")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.16")