From 92e4310582e76715daae459b0fb3d7030e681e1c Mon Sep 17 00:00:00 2001 From: Dai MIKURUBE Date: Wed, 11 Sep 2024 10:19:04 +0900 Subject: [PATCH] Disable build-logic --- build-logic-obsolete/README.md | 7 +++++++ {build-logic => build-logic-obsolete}/build.gradle | 0 .../gradle.lockfile | 0 .../EmbulkJUnitPlatformTestClassProcessor.java | 0 ...bulkJUnitPlatformTestClassProcessorFactory.java | 0 .../junit5/EmbulkJUnitPlatformTestFramework.java | 0 .../org/embulk/junit5/EmbulkPluginTestPlugin.java | 0 build.gradle | 14 +++++++++----- settings.gradle | 2 +- 9 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 build-logic-obsolete/README.md rename {build-logic => build-logic-obsolete}/build.gradle (100%) rename {build-logic => build-logic-obsolete}/gradle.lockfile (100%) rename {build-logic => build-logic-obsolete}/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessor.java (100%) rename {build-logic => build-logic-obsolete}/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessorFactory.java (100%) rename {build-logic => build-logic-obsolete}/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestFramework.java (100%) rename {build-logic => build-logic-obsolete}/src/main/java/org/embulk/junit5/EmbulkPluginTestPlugin.java (100%) diff --git a/build-logic-obsolete/README.md b/build-logic-obsolete/README.md new file mode 100644 index 0000000..8a5e9cb --- /dev/null +++ b/build-logic-obsolete/README.md @@ -0,0 +1,7 @@ +The build-logic (equivalent to a Gradle plugin) does not seem to be required. + +Only adding a `TestEngine` in the test runtime classpath would load the `TestEngine` in the test. + +https://github.com/gradle/gradle/blob/v8.10.0/platforms/documentation/docs/src/docs/userguide/jvm/java_testing.adoc#filtering-test-engine + +https://github.com/gradle/gradle/tree/v8.10.0/platforms/documentation/docs/src/snippets/testing/junitplatform-engine diff --git a/build-logic/build.gradle b/build-logic-obsolete/build.gradle similarity index 100% rename from build-logic/build.gradle rename to build-logic-obsolete/build.gradle diff --git a/build-logic/gradle.lockfile b/build-logic-obsolete/gradle.lockfile similarity index 100% rename from build-logic/gradle.lockfile rename to build-logic-obsolete/gradle.lockfile diff --git a/build-logic/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessor.java b/build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessor.java similarity index 100% rename from build-logic/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessor.java rename to build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessor.java diff --git a/build-logic/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessorFactory.java b/build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessorFactory.java similarity index 100% rename from build-logic/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessorFactory.java rename to build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestClassProcessorFactory.java diff --git a/build-logic/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestFramework.java b/build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestFramework.java similarity index 100% rename from build-logic/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestFramework.java rename to build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkJUnitPlatformTestFramework.java diff --git a/build-logic/src/main/java/org/embulk/junit5/EmbulkPluginTestPlugin.java b/build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkPluginTestPlugin.java similarity index 100% rename from build-logic/src/main/java/org/embulk/junit5/EmbulkPluginTestPlugin.java rename to build-logic-obsolete/src/main/java/org/embulk/junit5/EmbulkPluginTestPlugin.java diff --git a/build.gradle b/build.gradle index e65dd90..2bbb66d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "embulk-plugin-test" + // id "embulk-plugin-test" } repositories { @@ -14,10 +14,11 @@ configurations { compileClasspath.resolutionStrategy.activateDependencyLocking() runtimeClasspath.resolutionStrategy.activateDependencyLocking() - embulkTestImplementation.extendsFrom testImplementation - embulkTestRuntime.extendsFrom testRuntime + // embulkTestImplementation.extendsFrom testImplementation + // embulkTestRuntime.extendsFrom testRuntime } +/* sourceSets { embulkTest { java { @@ -26,15 +27,16 @@ sourceSets { resources.srcDir file("src/embulkTest/resources") } } +*/ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0" - embulkTestImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0" + // embulkTestImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0" - embulkTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0" + // embulkTestRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0" } // A safer and strict alternative to: "dependencies" (and "dependencies --write-locks") @@ -65,6 +67,7 @@ test { } } +/* task embulkTest(type: Test) { classpath = sourceSets.embulkTest.runtimeClasspath testClassesDirs = sourceSets.embulkTest.output.classesDirs @@ -80,3 +83,4 @@ task embulkTest(type: Test) { outputs.upToDateWhen { false } } } +*/ diff --git a/settings.gradle b/settings.gradle index 1f27cd7..93f0d93 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ rootProject.name = "embulk" -includeBuild "build-logic" +// includeBuild "build-logic" include "embulk-junit5-api" include "embulk-junit5-engine"