Skip to content

Commit

Permalink
Bump JGit version
Browse files Browse the repository at this point in the history
This requires upgrading to Java 11 and drops tests for older Gradle versions.
  • Loading branch information
melix committed Nov 19, 2024
1 parent 3edd26f commit 6e686d8
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 18 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = 0.1.7-SNAPSHOT
version = 0.2.0-SNAPSHOT
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
jgit = "5.13.0.202109080827-r"
jgit = "6.10.0.202406032230-r"
spock = "2.0-groovy-3.0"
groovy = "3.0.9"

Expand Down
2 changes: 1 addition & 1 deletion plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ group = "me.champeau.gradle.includegit"

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.eclipse.jgit.api.TransportCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.transport.JschConfigSessionFactory;
import org.eclipse.jgit.transport.OpenSshConfig;
import org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory;
import org.eclipse.jgit.transport.ssh.jsch.OpenSshConfig;
import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.SshTransport;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
Expand Down
4 changes: 2 additions & 2 deletions samples/advanced-includes/groovy/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ gitRepositories {
includeBuild(System.getProperty("subdir2")) {
name = 'testlib1_2'
dependencySubstitution {
substitute(module("com.acme.somelib:somelib2")).with(project(":"))
substitute(module("com.acme.somelib:somelib2")).using(project(":"))
}
}
} else if (System.getProperties().containsKey("subdir2")) {
includeBuild {
name = 'testlib'
dependencySubstitution {
substitute(module("com.acme.somelib:somelib2")).with(project(":"))
substitute(module("com.acme.somelib:somelib2")).using(project(":"))
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions samples/advanced-includes/kotlin/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ gitRepositories {
includeBuild(System.getProperty("subdir2")) {
name = "testlib1_2"
dependencySubstitution {
substitute(module("com.acme.somelib:somelib2")).with(project(":"))
substitute(module("com.acme.somelib:somelib2")).using(project(":"))
}
}
} else {
includeBuild {
name = "testlib"
dependencySubstitution {
substitute(module("com.acme.somelib:somelib2")).with(project(":"))
substitute(module("com.acme.somelib:somelib2")).using(project(":"))
}
}
}
Expand Down
11 changes: 2 additions & 9 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,10 @@ dependencyResolutionManagement {
gradle.beforeProject {
extra.set("supportedGradleVersions", setOf(
"", // current,
"6.2",
"6.3",
"6.4",
"6.5",
"6.6",
"6.7.1",
"6.8.2",
"6.9",
"7.1.1",
"7.2",
"7.3"
"7.3",
"8.11"
))
extra.set("unsupportedGradleVersions", setOf(
"6.0.x",
Expand Down

0 comments on commit 6e686d8

Please sign in to comment.