Revert "Move java and test configs out"

This reverts commit bf70502.
melix · Aug 27, 2024 · 1e4b764 · 1e4b764
1 parent bf70502
commit 1e4b764
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/build-logic/src/main/kotlin/me.champeau.convention-testing.gradle.kts b/build-logic/src/main/kotlin/me.champeau.convention-testing.gradle.kts
@@ -6,7 +6,6 @@ val isCiBuild = providers.environmentVariable("CI").isPresent
 
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
-    inputs.dir("src/test/test-projects").withPropertyName("testProjects")
 
     maxParallelForks = if (isCiBuild) {
         Runtime.getRuntime().availableProcessors()

diff --git a/build-logic/src/main/kotlin/me.champeau.convention.gradle.kts b/build-logic/src/main/kotlin/me.champeau.convention.gradle.kts
@@ -8,6 +8,18 @@ version = providers.gradleProperty("VERSION_NAME").get()
 group = providers.gradleProperty("GROUP").get()
 description = providers.gradleProperty("POM_DESCRIPTION").get()
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+    withSourcesJar()
+    withJavadocJar()
+}
+
+tasks.test {
+    inputs.dir("src/test/test-projects").withPropertyName("testProjects")
+}
+
 gradlePlugin {
     website = providers.gradleProperty("POM_URL")
     vcsUrl = providers.gradleProperty("POM_URL")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,14 +10,6 @@ buildScanRecipes {
     recipe(mapOf("baseUrl" to "https://github.com/melix/japicmp-gradle-plugin/tree"), "git-commit")
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-    withSourcesJar()
-    withJavadocJar()
-}
-
 dependencies {
     api("com.github.siom79.japicmp:japicmp:0.23.0") {
         exclude(group = "com.google.guava")