Skip to content

Commit 43880b1

Browse files
authored
Refactor gradle (#58)
1 parent e4d01a6 commit 43880b1

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@ charset=utf-8
55
insert_final_newline=true
66
trim_trailing_whitespace=true
77
max_line_length=120
8-
9-
[*.{kt,kts}]
10-
disabled_rules=import-ordering

build.gradle.kts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
2-
import org.gradle.api.tasks.testing.logging.TestLogEvent.*
3-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
3+
import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
4+
import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
45

56
plugins {
67
id("org.springframework.boot") version "3.3.0"
78
id("io.spring.dependency-management") version "1.1.5"
89
kotlin("jvm") version "2.0.0"
910
kotlin("plugin.spring") version "2.0.0"
11+
id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
1012
}
1113

1214
group = "com.example"
1315
version = "0.0.1-SNAPSHOT"
14-
java.sourceCompatibility = JavaVersion.VERSION_21
1516

1617
repositories {
1718
mavenCentral()
@@ -24,10 +25,15 @@ dependencies {
2425
testImplementation("org.assertj:assertj-core:3.26.0")
2526
}
2627

27-
tasks.withType<KotlinCompile> {
28-
kotlinOptions {
29-
freeCompilerArgs += "-Xjsr305=strict"
30-
jvmTarget = "21"
28+
java {
29+
toolchain {
30+
languageVersion = JavaLanguageVersion.of(21)
31+
}
32+
}
33+
34+
kotlin {
35+
compilerOptions {
36+
freeCompilerArgs.addAll("-Xjsr305=strict")
3137
}
3238
}
3339

src/main/java/com/acme/AcmeKotlinClassProperties.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ class AcmeKotlinClassProperties(
77
val enabled: Boolean,
88
val text: String,
99
val list: List<String>,
10-
val number: Float
10+
val number: Float,
1111
)

src/main/java/com/acme/AcmeKotlinDataClassProperties.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.acme
33
import org.springframework.boot.context.properties.ConfigurationProperties
44

55
@ConfigurationProperties("acme")
6-
data class AcmeKotlinDataClassProperties (
6+
data class AcmeKotlinDataClassProperties(
77
val enabled: Boolean,
88
val text: String,
99
val list: List<String>,
10-
val number: Float
10+
val number: Float,
1111
)

0 commit comments

Comments
 (0)