Merge branch 'typelevel:series/3.x' into 2882/make-UUIDGen-more-perfo…

…rmant
typelevel · Jun 7, 2023 · 4b4ded3 · 4b4ded3
2 parents 201d8e0 + 559ca9e
commit 4b4ded3
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 39 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,11 +28,11 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        scala: [3.2.2, 2.12.17, 2.13.10]
+        scala: [3.3.0, 2.12.17, 2.13.10]
         java: [temurin@8, temurin@11, temurin@17, graalvm@11]
         ci: [ciJVM, ciNative, ciJS, ciFirefox, ciChrome]
         exclude:
-          - scala: 3.2.2
+          - scala: 3.3.0
             java: temurin@11
           - scala: 2.12.17
             java: temurin@11
@@ -41,17 +41,17 @@ jobs:
           - scala: 2.12.17
             java: graalvm@11
           - os: windows-latest
-            scala: 3.2.2
+            scala: 3.3.0
           - os: macos-latest
-            scala: 3.2.2
+            scala: 3.3.0
           - os: windows-latest
             scala: 2.12.17
           - os: macos-latest
             scala: 2.12.17
           - ci: ciFirefox
-            scala: 3.2.2
+            scala: 3.3.0
           - ci: ciChrome
-            scala: 3.2.2
+            scala: 3.3.0
           - ci: ciFirefox
             scala: 2.12.17
           - ci: ciChrome
@@ -99,7 +99,7 @@ jobs:
             scala: 2.12.17
           - os: macos-latest
             ci: ciNative
-            scala: 3.2.2
+            scala: 3.3.0
           - os: windows-latest
             java: graalvm@11
     runs-on: ${{ matrix.os }}
@@ -235,24 +235,24 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check that scalafix has been run on JVM
-        if: matrix.ci == 'ciJVM' && matrix.scala != '3.2.2' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.ci == 'ciJVM' && matrix.scala != '3.3.0' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' 'rootJVM/scalafixAll --check'
 
       - name: Check that scalafix has been run on JS
-        if: matrix.ci == 'ciJS' && matrix.scala != '3.2.2' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.ci == 'ciJS' && matrix.scala != '3.3.0' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' 'rootJS/scalafixAll --check'
 
       - name: Check that scalafix has been run on Native
-        if: matrix.ci == 'ciNative' && matrix.scala != '3.2.2' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.ci == 'ciNative' && matrix.scala != '3.3.0' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' 'rootNative/scalafixAll --check'
 
       - shell: bash
         run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'
 
-      - if: (matrix.scala == '2.13.10' || matrix.scala == '3.2.2') && matrix.ci == 'ciJVM'
+      - if: (matrix.scala == '2.13.10' || matrix.scala == '3.3.0') && matrix.ci == 'ciJVM'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' docs/mdoc
 
@@ -408,32 +408,32 @@ jobs:
         if: matrix.java == 'graalvm@11' && steps.setup-java-graalvm-11.outputs.cache-hit == 'false'
         run: sbt '++ ${{ matrix.scala }}' reload +update
 
-      - name: Download target directories (3.2.2, ciJVM)
+      - name: Download target directories (3.3.0, ciJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-ciJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-ciJVM
 
-      - name: Inflate target directories (3.2.2, ciJVM)
+      - name: Inflate target directories (3.3.0, ciJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.2, ciNative)
+      - name: Download target directories (3.3.0, ciNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-ciNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-ciNative
 
-      - name: Inflate target directories (3.2.2, ciNative)
+      - name: Inflate target directories (3.3.0, ciNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.2.2, ciJS)
+      - name: Download target directories (3.3.0, ciJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-ciJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-ciJS
 
-      - name: Inflate target directories (3.2.2, ciJS)
+      - name: Inflate target directories (3.3.0, ciJS)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.3
+version = 3.7.4
 
 runner.dialect = Scala213Source3
 fileOverride {

diff --git a/build.sbt b/build.sbt
@@ -114,7 +114,7 @@ val MacOS = "macos-latest"
 
 val Scala212 = "2.12.17"
 val Scala213 = "2.13.10"
-val Scala3 = "3.2.2"
+val Scala3 = "3.3.0"
 
 ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)
 ThisBuild / githubWorkflowScalaVersions := crossScalaVersions.value

diff --git a/flake.lock b/flake.lock
diff --git a/project/Common.scala b/project/Common.scala
@@ -29,14 +29,17 @@ object Common extends AutoPlugin {
   override def requires = plugins.JvmPlugin && TypelevelPlugin && ScalafixPlugin
   override def trigger = allRequirements
 
+  override def buildSettings =
+    Seq(
+      semanticdbEnabled := true,
+      semanticdbVersion := scalafixSemanticdb.revision
+    )
+
   override def projectSettings =
     Seq(
       headerLicense := Some(
         HeaderLicense.ALv2(s"${startYear.value.get}-2023", organizationName.value)
       ),
-      ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0",
-      ThisBuild / semanticdbEnabled := !tlIsScala3.value,
-      ThisBuild / semanticdbVersion := scalafixSemanticdb.revision,
       tlVersionIntroduced ++= {
         if (crossProjectPlatform.?.value.contains(NativePlatform))
           List("2.12", "2.13", "3").map(_ -> "3.4.0").toMap

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,14 +4,14 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-M10")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")
 addSbtPlugin("pl.project13.scala" % "sbt-jcstress" % "0.2.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
 addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
 addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.3.4")
diff --git a/scalafix/project/build.properties b/scalafix/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0