diff --git a/gradle.properties b/gradle.properties index 2eeb4d7..f7ee9bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version = 0.1.7-SNAPSHOT +version = 0.2.0-SNAPSHOT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9a082b1..d5b3f96 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 3685138..8ddf936 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -13,7 +13,7 @@ group = "me.champeau.gradle.includegit" java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } diff --git a/plugin/src/main/java/me/champeau/gradle/igp/internal/DefaultIncludeGitExtension.java b/plugin/src/main/java/me/champeau/gradle/igp/internal/DefaultIncludeGitExtension.java index 4f15ef3..7e25ece 100644 --- a/plugin/src/main/java/me/champeau/gradle/igp/internal/DefaultIncludeGitExtension.java +++ b/plugin/src/main/java/me/champeau/gradle/igp/internal/DefaultIncludeGitExtension.java @@ -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; diff --git a/samples/advanced-includes/groovy/settings.gradle b/samples/advanced-includes/groovy/settings.gradle index 782fe66..b16b76c 100644 --- a/samples/advanced-includes/groovy/settings.gradle +++ b/samples/advanced-includes/groovy/settings.gradle @@ -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(":")) } } } diff --git a/samples/advanced-includes/kotlin/settings.gradle.kts b/samples/advanced-includes/kotlin/settings.gradle.kts index da42890..5d053ad 100644 --- a/samples/advanced-includes/kotlin/settings.gradle.kts +++ b/samples/advanced-includes/kotlin/settings.gradle.kts @@ -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(":")) } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 1c06c4c..296ffd0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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",