Update Kotlin and Scala gradle templates to match Java template

quarkusio · Nov 8, 2019 · c354448 · c354448
1 parent ffdb0b5
commit c354448
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...-descriptor-json/src/main/resources/templates/basic-rest/kotlin/build.gradle-template.ftl b/...-descriptor-json/src/main/resources/templates/basic-rest/kotlin/build.gradle-template.ftl
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation enforcedPlatform("io.quarkus:quarkus-bom:${quarkusVersion}")
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 

diff --git a/...m-descriptor-json/src/main/resources/templates/basic-rest/scala/build.gradle-template.ftl b/...m-descriptor-json/src/main/resources/templates/basic-rest/scala/build.gradle-template.ftl
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation enforcedPlatform("io.quarkus:quarkus-bom:${quarkusVersion}")
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
     implementation 'io.quarkus:quarkus-resteasy'
 
     testImplementation 'io.quarkus:quarkus-junit5'

diff --git a/...ent-projects/tools/common/src/main/java/io/quarkus/cli/commands/file/GradleBuildFile.java b/...ent-projects/tools/common/src/main/java/io/quarkus/cli/commands/file/GradleBuildFile.java
@@ -192,7 +192,9 @@ protected boolean hasDependency(Extension extension) throws IOException {
 
     @Override
     protected boolean containsBOM() throws IOException {
-        return getModel().getBuildContent().contains("enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:");
+    	String buildContent = getModel().getBuildContent();
+        return buildContent.contains("enforcedPlatform(\"${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:")
+        		|| buildContent.contains("enforcedPlatform(\"" + MojoUtils.getBomGroupId() + ":" + MojoUtils.getBomArtifactId() + ":");
     }
 
     @Override