Move Kotlin task customization to the bottom

initializr-generator/src/main/resources/templates/starter-build.gradle

@@ -46,19 +46,7 @@ apply plugin: 'war'
 
 group = '{{groupId}}'
 version = '{{version}}'
-sourceCompatibility = '{{javaVersion}}'{{#kotlin}}
+sourceCompatibility = '{{javaVersion}}'
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
-		jvmTarget = '1.8'{{/java8OrLater}}
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
-		jvmTarget = '1.8'{{/java8OrLater}}
-	}
-}{{/kotlin}}
 
 repositories {
 	mavenCentral()
@@ -118,4 +106,20 @@ dependencyManagement {
 		{{/reversedBoms}}
 	}
 }
-{{/hasBoms}}
+{{/hasBoms}}
+{{#kotlin}}
+
+compileKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
+		jvmTarget = '1.8'{{/java8OrLater}}
+	}
+}
+
+compileTestKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']{{#java8OrLater}}
+		jvmTarget = '1.8'{{/java8OrLater}}
+	}
+}
+{{/kotlin}}

initializr-generator/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen

@@ -22,18 +22,6 @@ apply plugin: 'io.spring.dependency-management'
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = '11'
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
 
 repositories {
 	mavenCentral()
@@ -45,3 +33,17 @@ dependencies {
 	implementation "org.jetbrains.kotlin:kotlin-reflect"
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
+
+compileKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}
+
+compileTestKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}

initializr-generator/src/test/resources/project/kotlin/previous/build.gradle.gen

@@ -21,18 +21,6 @@ apply plugin: 'org.springframework.boot'
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = '1.8'
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
 
 repositories {
 	mavenCentral()
@@ -44,3 +32,17 @@ dependencies {
 	implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
+
+compileKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}
+
+compileTestKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}

initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen

@@ -22,18 +22,6 @@ apply plugin: 'io.spring.dependency-management'
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = '1.8'
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
 
 repositories {
 	mavenCentral()
@@ -45,3 +33,17 @@ dependencies {
 	implementation "org.jetbrains.kotlin:kotlin-reflect"
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
+
+compileKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}
+
+compileTestKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}

initializr-generator/src/test/resources/project/kotlin/standard/war-build.gradle.gen

@@ -23,18 +23,6 @@ apply plugin: 'war'
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 sourceCompatibility = '1.8'
-compileKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
-compileTestKotlin {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '1.8'
-	}
-}
 
 repositories {
 	mavenCentral()
@@ -51,3 +39,17 @@ dependencies {
 	providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
+
+compileKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}
+
+compileTestKotlin {
+	kotlinOptions {
+		freeCompilerArgs = ['-Xjsr305=strict']
+		jvmTarget = '1.8'
+	}
+}