Bumped importClasses plugin (#135)

Author: gmazzo

gradle/libs.versions.toml

@@ -4,20 +4,20 @@ android = "8.8.0"
 
 [libraries]
 apache-bcel = { module = "org.apache.bcel:bcel", version = "6.10.0" }
-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "6.10.0.202406032230-r" }
+jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "7.1.0.202411261347-r" }
 junit-bom = { module = "org.junit:junit-bom", version = "5.11.4" }
 junit-params = { module = "org.junit.jupiter:junit-jupiter-params" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
 kotlin-plugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
 kotlin-plugin-compiler-api = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.16" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version = "2.0.16" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android" }
 android-library = { id = "com.android.library", version.ref = "android" }
 buildConfig = { id = "com.github.gmazzo.buildconfig", version = "5.5.1" }
-importClasses = { id = "io.github.gmazzo.importclasses", version = "1.0.3" }
+importClasses = { id = "io.github.gmazzo.importclasses", version = "1.1.1" }
 embeddedDependencies = { id = "io.github.gmazzo.dependencies.embedded", version = "1.0.3" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

plugins/base-plugin/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 
 description = "CodeOwners Gradle Base Plugin"
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 samWithReceiver.annotation(HasImplicitReceiver::class.java.name)
 

plugins/buildSrc/src/main/kotlin/jvm-convention-module.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     id("maven-central-publish")
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 plugins.withId("java") {
 

plugins/buildSrc/src/main/kotlin/plugin-compatibility-test.gradle.kts

@@ -10,7 +10,6 @@ val compatibilityTest by testing.suites.registering(JvmTestSuite::class) {
     }
     targets.configureEach {
         testTask.configure {
-            javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(17) }
             workingDir(temporaryDir)
         }
     }

plugins/jvm-plugin/build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 description = "CodeOwners JVM Gradle Plugin"
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 val pluginUnderTestImplementation by configurations.creating
 

plugins/kotlin-plugin/build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 description = "CodeOwners Kotlin Gradle Plugin"
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 val pluginUnderTestImplementation by configurations.creating
 

plugins/matcher/build.gradle.kts

@@ -6,15 +6,16 @@ plugins {
 
 description = "CodeOwners Matcher Library"
 
-sourceSets.main {
-    importClasses(libs.jgit) {
-        repackageTo = "io.github.gmazzo.codeowners.matcher.jgit"
-        keep("org.eclipse.jgit.ignore.FastIgnoreRule")
-        include("**.class")
-    }
+importClasses {
+    repackageTo = "io.github.gmazzo.codeowners.matcher.jgit"
+    keep("org.eclipse.jgit.ignore.FastIgnoreRule")
+    include("**.class")
 }
 
 dependencies {
-    implementation(libs.slf4j) // transitive of libs.jgit, required by FastIgnoreRule
+    importClasses(libs.jgit)
+    importClassesLibraries(libs.slf4j.api)
+    implementation(libs.slf4j.api)
+
     testImplementation(libs.junit.params)
 }

plugins/settings.gradle.kts

@@ -1,5 +1,12 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenLocal()
+    }
+}
+
 dependencyResolutionManagement {
     repositoriesMode = RepositoriesMode.PREFER_PROJECT
     repositories {