Skip to content

Commit 78354fb

Browse files
committed
Update JGit to latest from the 6.x.x series
Starting with JGit 7.0.0, Java 17 was required.
1 parent b74281b commit 78354fb

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import sbt._
22

33
object Dependencies {
44

5-
val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "6.7.0.202309050840-r"
5+
val jgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "6.10.0.202406032230-r"
66

7-
val scalatest = "org.scalatest" %% "scalatest" % "3.2.15"
7+
val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"
88

99
val madgagCompress = "com.madgag" % "util-compress" % "1.35"
1010

11-
val guava = Seq("com.google.guava" % "guava" % "32.1.3-jre", "com.google.code.findbugs" % "jsr305" % "3.0.2")
11+
val guava = Seq("com.google.guava" % "guava" % "33.4.0-jre", "com.google.code.findbugs" % "jsr305" % "3.0.2")
1212

1313
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ package com.madgag.git
1919
import java.io.File
2020
import java.io.File.separatorChar
2121
import java.net.URL
22-
23-
import com.google.common.io.Files
2422
import com.madgag.compress.CompressUtil._
2523
import org.eclipse.jgit.internal.storage.file.FileRepository
2624
import org.eclipse.jgit.storage.file.FileRepositoryBuilder
2725

26+
import java.nio.file.Files.createTempDirectory
27+
2828
package object test {
2929
def unpackRepo(fileName: String): FileRepository = {
3030
val resolvedGitDir = unpackRepoAndGetGitDir(fileName)
@@ -38,7 +38,8 @@ package object test {
3838
val rawZipFileInputStream = resource.openStream()
3939
assert(rawZipFileInputStream != null, s"Stream for $fileName is null.")
4040

41-
val repoParentFolder = new File(Files.createTempDir(), fileName.replace(separatorChar, '_') + "-unpacked")
41+
42+
val repoParentFolder = new File(createTempDirectory("test").toFile, fileName.replace(separatorChar, '_') + "-unpacked")
4243
repoParentFolder.mkdir()
4344

4445
unzip(rawZipFileInputStream, repoParentFolder)

0 commit comments

Comments
 (0)