Merge pull request #13 from sqids/upgrade_libraries

jesperoman · web-flow · commit d3e47f0d3847 · 2025-02-18T17:09:17.000+01:00
Upgrade libraries and make it build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,85 +15,74 @@ on:
     tags: [v*]
 
 env:
-  PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-  SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  PGP_SECRET: ${{ secrets.PGP_SECRET }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    name: Build and Test
+    name: Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        scala: [2.13.11, 3.3.0]
+        os: [ubuntu-22.04]
+        scala: [2.13, 3]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
         run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' doc
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p target project/target
+        run: mkdir -p target core/.jvm/target core/.native/target core/.js/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 target project/target
+        run: tar cf targets.tar target core/.jvm/target core/.native/target core/.js/target project/target
 
       - 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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
           path: targets.tar
@@ -104,73 +93,71 @@ jobs:
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
-      - name: Download target directories (2.13.11)
-        uses: actions/download-artifact@v3
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Download target directories (2.13)
+        uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13
 
-      - name: Inflate target directories (2.13.11)
+      - name: Inflate target directories (2.13)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
-        uses: actions/download-artifact@v3
+      - name: Download target directories (3)
+        uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3)
         run: |
           tar xf targets.tar
           rm targets.tar
 
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
-        run: echo $PGP_SECRET | base64 -di | gpg --import
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+        run: echo $PGP_SECRET | base64 -d -i - | gpg --import
 
       - name: Import signing key and strip passphrase
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
-          echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
+          echo "$PGP_SECRET" | base64 -d -i - > /tmp/signing-key.gpg
           echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
           (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
 
       - name: Publish
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
         run: sbt tlCiRelease
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,6 +1,3 @@
-# This file was auto-generated by sbt-magine. Do not modify nor add it to gitignore.
-# You can re-generate this file at any time with `sbt magineGenerateScalafmtConfig`.
-
 align = none
 align.arrowEnumeratorGenerator = false
 align.openParenCallSite = false
@@ -30,7 +27,7 @@ rewrite.redundantBraces.stringInterpolation = true
 rewrite.redundantBraces.includeUnitMethods = false
 rewrite.rules = [ExpandImportSelectors, PreferCurlyFors, RedundantBraces, RedundantParens]
 rewrite.trailingCommas.style = keep
-runner.dialect = scala213
+runner.dialect = scala213source3
 version = 3.7.12
 verticalMultiline.arityThreshold = 3
 verticalMultiline.atDefnSite = true
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
-lazy val scala213 = "2.13.11"
-lazy val scala3 = "3.3.0"
+lazy val scala213 = "2.13.16"
+lazy val scala3 = "3.3.5"
 lazy val supportedScalaVersions = List(scala213, scala3)
 
 ThisBuild / organization := "org.sqids"
@@ -9,10 +9,11 @@ ThisBuild / licenses := Seq(License.MIT)
 ThisBuild / developers ++= List(
   tlGitHubDev("jesperoman", "Jesper Öman")
 )
-ThisBuild / tlBaseVersion := "0.5"
+ThisBuild / tlBaseVersion := "0.6"
 ThisBuild / crossScalaVersions := supportedScalaVersions
 ThisBuild / scalaVersion := scala213
-ThisBuild / tlSonatypeUseLegacyHost := false
+ThisBuild / mimaFailOnNoPrevious := false
+ThisBuild / tlCiDependencyGraphJob := false
 
 lazy val root =
   project
diff --git a/core/src/main/scala/sqids/options/Alphabet.scala b/core/src/main/scala/sqids/options/Alphabet.scala
@@ -12,7 +12,7 @@ import sqids.Utils.StringOps
 
 sealed abstract case class Alphabet(value: Vector[Char]) {
   def length = value.length
-  def indexOf(c: Char) = value.indexOf(c.toInt)
+  def indexOf(c: Char) = value.indexOf(c)
   def prefix = value.head
   def separator: Char = value.head
   def removeSeparator: Alphabet = new Alphabet(value.tail) {}
@@ -55,7 +55,7 @@ sealed abstract case class Alphabet(value: Vector[Char]) {
         }
     ) {}
 
-  def offsetFromPrefix(prefix: Char) = value.indexOf(prefix.toInt)
+  def offsetFromPrefix(prefix: Char) = value.indexOf(prefix)
 
   def getOffset(numbers: List[Long], increment: Int): Int =
     (numbers.indices.foldLeft(numbers.length) { (offset, i) =>
diff --git a/core/src/test/scala/sqids/SqidsSuite_encoding.scala b/core/src/test/scala/sqids/SqidsSuite_encoding.scala
@@ -107,15 +107,6 @@ final class SqidsSuite_encoding extends ScalaCheckSuite {
       sqids.encode(List(-1L)),
       Left(SqidsError.OutOfRange("some nr is out of range: -1, max: 9223372036854775807 min: 0"))
     )
-
-    assertEquals(
-      sqids.encode(List(Long.MaxValue + 1)),
-      Left(
-        SqidsError.OutOfRange(
-          "some nr is out of range: -9223372036854775808, max: 9223372036854775807 min: 0"
-        )
-      )
-    )
   }
 
   property("arbitrary numbers") {
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.3
+sbt.version = 1.10.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7")
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version = 1.9.3`
	`1`	`+sbt.version = 1.10.7`