diff --git a/buildSrc/src/main/kotlin/twomartens.base.gradle.kts b/buildSrc/src/main/kotlin/twomartens.base.gradle.kts index a863b4c..a291887 100644 --- a/buildSrc/src/main/kotlin/twomartens.base.gradle.kts +++ b/buildSrc/src/main/kotlin/twomartens.base.gradle.kts @@ -1,5 +1,5 @@ plugins { - idea + id("idea") } val projectgroup: String = providers.gradleProperty("projectgroup").get() diff --git a/buildSrc/src/main/kotlin/twomartens.checkstyle.gradle.kts b/buildSrc/src/main/kotlin/twomartens.checkstyle.gradle.kts index f45bb90..ea7a8ce 100644 --- a/buildSrc/src/main/kotlin/twomartens.checkstyle.gradle.kts +++ b/buildSrc/src/main/kotlin/twomartens.checkstyle.gradle.kts @@ -1,10 +1,10 @@ plugins { - checkstyle + id("checkstyle") id("twomartens.java-base") } checkstyle { - toolVersion = "10.0" + toolVersion = "10.12.4" isIgnoreFailures = false maxWarnings = 0 diff --git a/buildSrc/src/main/kotlin/twomartens.java-base.gradle.kts b/buildSrc/src/main/kotlin/twomartens.java-base.gradle.kts index c665e7d..84241a0 100644 --- a/buildSrc/src/main/kotlin/twomartens.java-base.gradle.kts +++ b/buildSrc/src/main/kotlin/twomartens.java-base.gradle.kts @@ -1,8 +1,8 @@ plugins { - java - `java-library` + id("java") + id("java-library") id("twomartens.base") - application + id("application") } val projectSourceCompatibility: String = rootProject.properties["projectSourceCompatibility"].toString() diff --git a/buildSrc/src/main/kotlin/twomartens.java.gradle.kts b/buildSrc/src/main/kotlin/twomartens.java.gradle.kts index 21e4f8c..fba772a 100644 --- a/buildSrc/src/main/kotlin/twomartens.java.gradle.kts +++ b/buildSrc/src/main/kotlin/twomartens.java.gradle.kts @@ -1,7 +1,7 @@ import org.gradle.accessors.dm.LibrariesForLibs plugins { - jacoco + id("jacoco") id("io.freefair.lombok") id("twomartens.java-base") id("twomartens.checkstyle") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 36a6149..cd6601b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,6 +26,7 @@ plugin-gradle-versions = "0.46.0" plugin-version-catalog = "0.8.0" plugin-kotlin-gradle = "1.9.21" plugin-jib = "3.4.5" +plugin-checkstyle = "10.12.4" [libraries] spring-boot = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" } @@ -93,6 +94,7 @@ plugin-version-catalog = { module = "nl.littlerobots.vcu:plugin", version.ref = plugin-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "plugin-kotlin-gradle" } plugin-kotlin-spring = { module = "org.jetbrains.kotlin.plugin.spring:org.jetbrains.kotlin.plugin.spring.gradle.plugin", version.ref = "plugin-kotlin-gradle" } plugin-jib = { module = "com.google.cloud.tools:jib-gradle-plugin", version.ref = "plugin-jib" } +plugin-chekstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "plugin-checkstyle" } [bundles] logging = [ @@ -143,3 +145,4 @@ test = [ [plugins] kotlin-lombok = { id = "org.jetbrains.kotlin.plugin.lombok", version.ref = "kotlin-lombok" } +checkstyle = { id = "com.puppycrawl.tools.checkstyle", version.ref = "plugin-checkstyle" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e11132..ca025c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME