From d3c68d721f6ac6a5277c323edfd4d6cee59ef45d Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Tue, 12 Dec 2023 10:11:28 -0600 Subject: [PATCH] ccc --- .../builds/BaseKotlinConventionPlugin.kt | 10 ---------- .../kase/gradle/HasGradleRunner.kt | 19 ------------------- 2 files changed, 29 deletions(-) diff --git a/build-logic/conventions/src/main/kotlin/builds/BaseKotlinConventionPlugin.kt b/build-logic/conventions/src/main/kotlin/builds/BaseKotlinConventionPlugin.kt index c3e8394..56348df 100644 --- a/build-logic/conventions/src/main/kotlin/builds/BaseKotlinConventionPlugin.kt +++ b/build-logic/conventions/src/main/kotlin/builds/BaseKotlinConventionPlugin.kt @@ -19,9 +19,7 @@ import com.rickbusarow.kgx.javaExtension import org.gradle.api.JavaVersion import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.provider.Property -import org.gradle.api.tasks.bundling.Jar import org.gradle.api.tasks.compile.JavaCompile import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets @@ -65,14 +63,6 @@ abstract class BaseKotlinConventionPlugin : Plugin { } target.javaExtension.sourceCompatibility = JavaVersion.toVersion(target.JVM_TARGET) - - // fixes the error - // 'Entry classpath.index is a duplicate but no duplicate handling strategy has been set.' - // when executing a Jar task - // https://github.com/gradle/gradle/issues/17236 - target.tasks.withType(Jar::class.java).configureEach { task -> - task.duplicatesStrategy = DuplicatesStrategy.INCLUDE - } } } diff --git a/kase-gradle/src/main/kotlin/com/rickbusarow/kase/gradle/HasGradleRunner.kt b/kase-gradle/src/main/kotlin/com/rickbusarow/kase/gradle/HasGradleRunner.kt index 7e26840..b5e4082 100644 --- a/kase-gradle/src/main/kotlin/com/rickbusarow/kase/gradle/HasGradleRunner.kt +++ b/kase-gradle/src/main/kotlin/com/rickbusarow/kase/gradle/HasGradleRunner.kt @@ -28,25 +28,6 @@ import org.gradle.testkit.runner.GradleRunner import org.gradle.testkit.runner.TaskOutcome.FAILED import org.gradle.util.GradleVersion -/** - * Models the contents of a Gradle project. - * - * @since 0.1.0 - */ -// public interface GradleProjectSpec { -// public val projectDir: File -// public val buildFile: File -// public val gradleDotProperties: File? -// } -// -// public interface RootGradleProjectSpec : GradleProjectSpec { -// public val settingsFile: File -// } -// -// public fun interface WritesGradleScripts { -// public fun writeGradleFiles() -// } - /** * Trait interface for a test environment with a [GradleRunner]. *