From e271746169f11fd208a4e609fe66250139deb3d9 Mon Sep 17 00:00:00 2001 From: Guillaume Le Floch Date: Wed, 21 Oct 2020 14:24:15 +0200 Subject: [PATCH] Remove unnecessary kotlin path declaration in gradle build file --- .../kotlin/build.tpl.qute.gradle.kts | 8 -------- .../gradle/kotlin/build.tpl.qute.gradle | 8 -------- .../resources/kotlin-grpc-project/build.gradle | 17 ----------------- 3 files changed, 33 deletions(-) diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts index 1a169874299de..a90e0705a1086 100644 --- a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts +++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts @@ -8,14 +8,6 @@ plugins { {/plugins} {/include} -quarkus { - setOutputDirectory("$projectDir/build/classes/kotlin/main") -} - -tasks.withType { - setSourceDir("$projectDir/src/main/kotlin") -} - allOpen { annotation("javax.ws.rs.Path") annotation("javax.enterprise.context.ApplicationScoped") diff --git a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/kotlin/build.tpl.qute.gradle b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/kotlin/build.tpl.qute.gradle index deb04d2f6bf96..687990707f197 100644 --- a/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/kotlin/build.tpl.qute.gradle +++ b/devtools/platform-descriptor-json/src/main/resources/codestarts/quarkus/core/buildtool/gradle/kotlin/build.tpl.qute.gradle @@ -8,14 +8,6 @@ plugins { {/plugins} {/include} -quarkus { - setOutputDirectory("$projectDir/build/classes/kotlin/main") -} - -quarkusDev { - setSourceDir("$projectDir/src/main/kotlin") -} - allOpen { annotation("javax.ws.rs.Path") annotation("javax.enterprise.context.ApplicationScoped") diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle index 44368d774089d..c1e8feb0c3d23 100644 --- a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle +++ b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle @@ -23,33 +23,16 @@ dependencies { group 'org.acme' version '1.0.0-SNAPSHOT' -quarkus { - setOutputDirectory("$projectDir/build/classes/kotlin/main") -} - -quarkusDev { - setSourceDir("$projectDir/src/main/kotlin") -} - allOpen { annotation("javax.ws.rs.Path") annotation("javax.enterprise.context.ApplicationScoped") annotation("io.quarkus.test.junit.QuarkusTest") } -java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} - compileKotlin { - kotlinOptions.jvmTarget = JavaVersion.VERSION_11 kotlinOptions.javaParameters = true } -compileTestKotlin { - kotlinOptions.jvmTarget = JavaVersion.VERSION_11 -} test { systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager" } \ No newline at end of file