From 61c7acae39d40175f848953522f0b56ba7364d6b Mon Sep 17 00:00:00 2001 From: Voomra Date: Wed, 15 Apr 2026 19:59:19 +0300 Subject: [PATCH] =?UTF-8?q?build:=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20Gradle=20Kotlin=20DSL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle => build.gradle.kts | 2 +- fluent-syntax/build.gradle | 56 -------------------------- fluent-syntax/build.gradle.kts | 43 ++++++++++++++++++++ gradle/libs.versions.toml | 7 ++++ settings.gradle => settings.gradle.kts | 0 5 files changed, 51 insertions(+), 57 deletions(-) rename build.gradle => build.gradle.kts (75%) delete mode 100644 fluent-syntax/build.gradle create mode 100644 fluent-syntax/build.gradle.kts create mode 100644 gradle/libs.versions.toml rename settings.gradle => settings.gradle.kts (100%) diff --git a/build.gradle b/build.gradle.kts similarity index 75% rename from build.gradle rename to build.gradle.kts index 3503191..9fb736f 100644 --- a/build.gradle +++ b/build.gradle.kts @@ -1,4 +1,4 @@ -wrapper { +tasks.withType { gradleVersion = "8.10" distributionType = Wrapper.DistributionType.BIN } diff --git a/fluent-syntax/build.gradle b/fluent-syntax/build.gradle deleted file mode 100644 index 0719a15..0000000 --- a/fluent-syntax/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -plugins { - id("java") - id("maven-publish") -} - -group = "ru.di9.fluent" -version = "1.0-SNAPSHOT" - -java.toolchain { - languageVersion = JavaLanguageVersion.of(17) -} - -repositories { - mavenLocal() - mavenCentral() -} - -ext { - assertjVersion = "3.24.2" - gsonVersion = "2.9.1" - joorVersion = "0.9.15" - jsonAssertVersion = "1.5.1" - junitVersion = "5.9.2" - lombokVersion = "1.18.30" -} - -dependencies { - annotationProcessor("org.projectlombok:lombok:$lombokVersion") - compileOnly("org.projectlombok:lombok:$lombokVersion") - - testImplementation(platform("org.junit:junit-bom:$junitVersion")) - testImplementation("org.junit.jupiter:junit-jupiter") - - testAnnotationProcessor("org.projectlombok:lombok:$lombokVersion") - testCompileOnly("org.projectlombok:lombok:$lombokVersion") - testImplementation("org.assertj:assertj-core:$assertjVersion") - testImplementation("com.google.code.gson:gson:$gsonVersion") - testImplementation("org.jooq:joor:$joorVersion") - testImplementation("org.skyscreamer:jsonassert:$jsonAssertVersion") -} - -test { - useJUnitPlatform() -} - -publishing { - publications { - mavenBinary(MavenPublication) { - groupId = project.group - artifactId = project.name - version = project.version - - from components.java - } - } -} diff --git a/fluent-syntax/build.gradle.kts b/fluent-syntax/build.gradle.kts new file mode 100644 index 0000000..6024dcc --- /dev/null +++ b/fluent-syntax/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + java + id("maven-publish") +} + +group = "ru.di9.fluent" +version = "1.0-SNAPSHOT" + +java.toolchain { + languageVersion = JavaLanguageVersion.of(17) +} + +repositories { + mavenLocal() + mavenCentral() +} + +dependencies { + annotationProcessor(libs.lombok) + compileOnly(libs.lombok) + + testImplementation(libs.junit) + testAnnotationProcessor(libs.lombok) + testCompileOnly(libs.lombok) + testImplementation(libs.assertj) + testImplementation(libs.gson) + testImplementation(libs.joor) + testImplementation(libs.jsonassert) +} + +tasks.withType { + useJUnitPlatform() +} + +publishing.publications { + create("mavenBinary") { + groupId = project.group.toString() + artifactId = project.name + version = project.version.toString() + + from(components["java"]) + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..7d25ded --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,7 @@ +[libraries] +lombok = { group = "org.projectlombok", name = "lombok", version = "1.18.30" } +junit = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.9.2" } +assertj = { group = "org.assertj", name = "assertj-core", version = "3.24.2" } +gson = { group = "com.google.code.gson", name = "gson", version = "2.9.1" } +joor = { group = "org.jooq", name = "joor", version = "0.9.15" } +jsonassert = { group = "org.skyscreamer", name = "jsonassert", version = "1.5.1" } diff --git a/settings.gradle b/settings.gradle.kts similarity index 100% rename from settings.gradle rename to settings.gradle.kts