Apply consistent ordering to the Kotlin Gradle build customizer

Closes gh-1559
spring-io · Aug 8, 2024 · ec37fbf · ec37fbf
1 parent f5cdbd0
commit ec37fbf
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/...n/java/io/spring/initializr/generator/spring/code/kotlin/KotlinGradleBuildCustomizer.java b/...n/java/io/spring/initializr/generator/spring/code/kotlin/KotlinGradleBuildCustomizer.java
@@ -21,6 +21,7 @@
 import io.spring.initializr.generator.buildsystem.gradle.GradleBuild;
 import io.spring.initializr.generator.spring.build.BuildCustomizer;
 
+import org.springframework.core.Ordered;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -61,4 +62,11 @@ private List<String> quote(List<String> compilerArgs) {
 		return compilerArgs.stream().map((element) -> this.quote + element + this.quote).toList();
 	}
 
+	@Override
+	public int getOrder() {
+		// See
+		// io.spring.initializr.generator.spring.build.gradle.GradleProjectGenerationConfiguration.LANGUAGE_PLUGINS_ORDER
+		return Ordered.HIGHEST_PRECEDENCE + 5;
+	}
+
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen
@@ -1,8 +1,8 @@
 plugins {
-	id 'org.springframework.boot' version '2.4.1'
-	id 'io.spring.dependency-management' version '1.0.6.RELEASE'
 	id 'org.jetbrains.kotlin.jvm' version '1.1.1'
 	id 'org.jetbrains.kotlin.plugin.spring' version '1.1.1'
+	id 'org.springframework.boot' version '2.4.1'
+	id 'io.spring.dependency-management' version '1.0.6.RELEASE'
 }
 
 group = 'com.example'

diff --git a/...izr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen b/...izr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen
@@ -1,8 +1,8 @@
 plugins {
-	id("org.springframework.boot") version "2.4.1"
-	id("io.spring.dependency-management") version "1.0.6.RELEASE"
 	kotlin("jvm") version "1.1.1"
 	kotlin("plugin.spring") version "1.1.1"
+	id("org.springframework.boot") version "2.4.1"
+	id("io.spring.dependency-management") version "1.0.6.RELEASE"
 }
 
 group = "com.example"

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen
@@ -1,8 +1,8 @@
 plugins {
-	id 'org.springframework.boot' version '2.4.1'
-	id 'io.spring.dependency-management' version '1.0.6.RELEASE'
 	id 'org.jetbrains.kotlin.jvm' version '1.1.1'
 	id 'org.jetbrains.kotlin.plugin.spring' version '1.1.1'
+	id 'org.springframework.boot' version '2.4.1'
+	id 'io.spring.dependency-management' version '1.0.6.RELEASE'
 }
 
 group = 'com.example'

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen
@@ -1,8 +1,8 @@
 plugins {
-	id("org.springframework.boot") version "2.4.1"
-	id("io.spring.dependency-management") version "1.0.6.RELEASE"
 	kotlin("jvm") version "1.1.1"
 	kotlin("plugin.spring") version "1.1.1"
+	id("org.springframework.boot") version "2.4.1"
+	id("io.spring.dependency-management") version "1.0.6.RELEASE"
 }
 
 group = "com.example"

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen
@@ -1,9 +1,9 @@
 plugins {
+	id 'org.jetbrains.kotlin.jvm' version '1.1.1'
+	id 'org.jetbrains.kotlin.plugin.spring' version '1.1.1'
 	id 'war'
 	id 'org.springframework.boot' version '2.4.1'
 	id 'io.spring.dependency-management' version '1.0.6.RELEASE'
-	id 'org.jetbrains.kotlin.jvm' version '1.1.1'
-	id 'org.jetbrains.kotlin.plugin.spring' version '1.1.1'
 }
 
 group = 'com.example'

diff --git a/...lizr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen b/...lizr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen
@@ -1,9 +1,9 @@
 plugins {
+	kotlin("jvm") version "1.1.1"
+	kotlin("plugin.spring") version "1.1.1"
 	war
 	id("org.springframework.boot") version "2.4.1"
 	id("io.spring.dependency-management") version "1.0.6.RELEASE"
-	kotlin("jvm") version "1.1.1"
-	kotlin("plugin.spring") version "1.1.1"
 }
 
 group = "com.example"