Support Scala 3

Author: rtyley

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: guardian/setup-scala@v1
       - name: Build and Test
         run: sbt -v +test

.github/workflows/release.yml

@@ -5,12 +5,10 @@ on:
 
 jobs:
   release:
-    uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@v1
+    uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@v2
     permissions: { contents: write, pull-requests: write }
     with:
       GITHUB_APP_ID: 930725
-      SONATYPE_PROFILE_NAME: 'com.madgag'
-      SONATYPE_CREDENTIAL_HOST: 's01.oss.sonatype.org'
     secrets:
       SONATYPE_TOKEN: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN }}
       PGP_PRIVATE_KEY: ${{ secrets.AUTOMATED_MAVEN_RELEASE_PGP_SECRET }}

.tool-versions

@@ -1 +1 @@
-java corretto-11.0.25.9.1
+java corretto-21.0.3.9.1

build.sbt

@@ -2,33 +2,40 @@ import ReleaseTransformations.*
 import sbtversionpolicy.withsbtrelease.ReleaseVersion
 import Dependencies.*
 
+ThisBuild / scalaVersion := "3.3.6"
+ThisBuild / crossScalaVersions := Seq(
+  scalaVersion.value,
+  "2.13.16"
+)
+ThisBuild / scalacOptions := Seq("-deprecation", "-release:11")
+
 lazy val artifactProducingProjectSettings = Seq(
-  scalaVersion := "2.13.16",
   organization := "com.madgag.scala-git",
   licenses := Seq(License.Apache2),
   scalacOptions ++= Seq("-deprecation", "-unchecked", "-release:11"),
-  libraryDependencies ++= Seq(madgagCompress % Test, scalatest % Test)
+  libraryDependencies ++= Seq(scalatest % Test)
 )
 
 lazy val `scala-git` = project.settings(artifactProducingProjectSettings *).dependsOn(`scala-git-test` % Test).settings(
   libraryDependencies ++= Seq(
     jgit,
     "com.madgag" %% "scala-collection-plus" % "1.0.0",
     scalatest % Test
-  )
+  ),
+  Test / fork := true
 )
 
 lazy val `scala-git-test` = project.in(file("scala-git-test")).settings(artifactProducingProjectSettings *).settings(
-  libraryDependencies ++= guava :+ madgagCompress :+ jgit
+  libraryDependencies ++= guava :+ zip4j :+ jgit
 )
 
 ThisBuild / Test / testOptions +=
   Tests.Argument(TestFrameworks.ScalaTest, "-u", s"test-results/scala-${scalaVersion.value}", "-o")
 
 lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).settings(
   publish / skip := true,
-  releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease().value,
-  // releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
+  // releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease().value,
+  releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
   releaseProcess := Seq[ReleaseStep](
     checkSnapshotDependencies,
     inquireVersions,

project/Dependencies.scala

@@ -2,12 +2,12 @@ import sbt._
 
 object Dependencies {
 
-  val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "6.10.0.202406032230-r"
+  val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "7.3.0.202506031305-r"
 
   val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
 
-  val madgagCompress = "com.madgag" % "util-compress" % "1.35"
+  val zip4j = "net.lingala.zip4j" % "zip4j" % "2.11.5"
 
-  val guava = Seq("com.google.guava" % "guava" % "33.4.0-jre", "com.google.code.findbugs" % "jsr305" % "3.0.2")
+  val guava = Seq("com.google.guava" % "guava" % "33.4.8-jre", "com.google.code.findbugs" % "jsr305" % "3.0.2")
 
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.11.4

project/plugins.sbt

@@ -1,5 +1,3 @@
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
-
 addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")

scala-git-test/src/main/scala/com/madgag/git/test/package.scala

@@ -16,10 +16,11 @@
 
 package com.madgag.git
 
+import net.lingala.zip4j.ZipFile
+
 import java.io.File
 import java.io.File.separatorChar
 import java.net.URL
-import com.madgag.compress.CompressUtil._
 import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder
 
@@ -32,18 +33,18 @@ package object test {
     FileRepositoryBuilder.create(resolvedGitDir).asInstanceOf[FileRepository]
   }
 
-  def unpackRepoAndGetGitDir(fileName: String) = {
+  def unpackRepoAndGetGitDir(fileName: String): File = {
     val resource: URL = getClass.getResource(fileName)
     assert(resource != null, s"Resource for $fileName is null.")
-    val rawZipFileInputStream = resource.openStream()
-    assert(rawZipFileInputStream != null, s"Stream for $fileName is null.")
 
+    val file = new File(resource.toURI)
+    assert(file.exists(), s"File $file does not exist.")
 
     val repoParentFolder = new File(createTempDirectory("test").toFile, fileName.replace(separatorChar, '_') + "-unpacked")
     repoParentFolder.mkdir()
 
-    unzip(rawZipFileInputStream, repoParentFolder)
-    rawZipFileInputStream.close
+    new ZipFile(file.getAbsolutePath).extractAll(repoParentFolder.getAbsolutePath)
+
     repoParentFolder
   }
 }

version.sbt

@@ -1 +1 @@
-ThisBuild / version := "6.0.1-SNAPSHOT"
+ThisBuild / version := "7.0.0-SNAPSHOT"