From 30df43459a2cfeb0c7eff9bbc565939af69af712 Mon Sep 17 00:00:00 2001 From: Alexey Zhokhov Date: Sat, 21 Oct 2023 23:56:12 +0800 Subject: [PATCH] Up gradle dependencies. --- build.gradle.kts | 14 +++++++------- buildSrc/build.gradle.kts | 14 ++++++++++++-- .../jambalaya-library-conventions.gradle.kts | 4 ---- jambalaya-checks-jooq/build.gradle.kts | 3 --- jambalaya-example-jooq/build.gradle.kts | 3 --- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 39ddc4c..ff84112 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,21 +1,21 @@ plugins { // https://plugins.gradle.org/plugin/com.tailrocks.java - id("com.tailrocks.java") version "0.3.0" + id("com.tailrocks.java") version "0.4.0" // https://plugins.gradle.org/plugin/com.tailrocks.spotless - id("com.tailrocks.spotless") version "0.3.0" + id("com.tailrocks.spotless") version "0.4.0" // https://plugins.gradle.org/plugin/com.tailrocks.idea - id("com.tailrocks.idea") version "0.3.0" apply false + id("com.tailrocks.idea") version "0.4.0" apply false // https://plugins.gradle.org/plugin/com.tailrocks.junit - id("com.tailrocks.junit") version "0.3.0" apply false + id("com.tailrocks.junit") version "0.4.0" apply false // https://plugins.gradle.org/plugin/com.tailrocks.versions - id("com.tailrocks.versions") version "0.3.0" apply false + id("com.tailrocks.versions") version "0.4.0" apply false // https://plugins.gradle.org/plugin/com.tailrocks.kotlin - id("com.tailrocks.kotlin") version "0.3.0" apply false + id("com.tailrocks.kotlin") version "0.5.0" apply false // https://plugins.gradle.org/plugin/com.adarshr.test-logger id("com.adarshr.test-logger") version "4.0.0" apply false @@ -42,7 +42,7 @@ allprojects { } subprojects { - apply(plugin = "java") + apply(plugin = "com.tailrocks.java") apply(plugin = "com.adarshr.test-logger") dependencies { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bbe5119..0677d28 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,11 +1,21 @@ +import org.jetbrains.kotlin.gradle.dsl.jvm.JvmTargetValidationMode + plugins { `kotlin-dsl` } dependencies { // https://plugins.gradle.org/plugin/com.tailrocks.maven-publish - implementation("com.tailrocks.gradle:maven-publish-conventions:0.2.0") + implementation("com.tailrocks.gradle:maven-publish-conventions:0.4.0") // https://plugins.gradle.org/plugin/com.tailrocks.signing - implementation("com.tailrocks.gradle:signing-conventions:0.2.0") + implementation("com.tailrocks.gradle:signing-conventions:0.4.0") +} + +project.tasks.withType { + kotlinOptions { + jvmTarget = "20" + javaParameters = true + } + jvmTargetValidationMode.set(JvmTargetValidationMode.WARNING) } diff --git a/buildSrc/src/main/kotlin/jambalaya-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/jambalaya-library-conventions.gradle.kts index 9608aed..bd191e6 100644 --- a/buildSrc/src/main/kotlin/jambalaya-library-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/jambalaya-library-conventions.gradle.kts @@ -1,7 +1,3 @@ -import org.gradle.api.publish.maven.internal.publication.DefaultMavenPom -import org.gradle.kotlin.dsl.`java-library` -import org.gradle.kotlin.dsl.`maven-publish` - plugins { `java-library` `maven-publish` diff --git a/jambalaya-checks-jooq/build.gradle.kts b/jambalaya-checks-jooq/build.gradle.kts index ece09f5..47eac91 100644 --- a/jambalaya-checks-jooq/build.gradle.kts +++ b/jambalaya-checks-jooq/build.gradle.kts @@ -13,9 +13,6 @@ dependencies { api(project(":jambalaya-checks")) testImplementation(project(":jambalaya-example-jooq")) - // Micronaut - implementation(platform(jambalayaLibs.boms.micronaut)) - implementation("org.jooq:jooq") // Kotlin diff --git a/jambalaya-example-jooq/build.gradle.kts b/jambalaya-example-jooq/build.gradle.kts index 987c5a6..9f7f0c7 100644 --- a/jambalaya-example-jooq/build.gradle.kts +++ b/jambalaya-example-jooq/build.gradle.kts @@ -3,8 +3,5 @@ plugins { } dependencies { - // Micronaut - implementation(platform(jambalayaLibs.boms.micronaut)) - api("org.jooq:jooq") }