From d844e924750f8a645b0dd9f5009c47f8ced85602 Mon Sep 17 00:00:00 2001 From: Martin Date: Sat, 29 Jun 2024 14:16:40 +0200 Subject: [PATCH] Simplify gradle. --- buildSrc/src/main/kotlin/Versions.kt | 9 +++++++++ .../main/kotlin/multification-java-17.gradle.kts | 2 +- .../kotlin/multification-java-unit-test.gradle.kts | 14 +++++++------- .../src/main/kotlin/multification-java.gradle.kts | 2 +- .../main/kotlin/multification-publish.gradle.kts | 4 ++-- .../kotlin/multification-repositories.gradle.kts | 2 +- multification-bukkit/build.gradle.kts | 4 ++-- multification-cdn/build.gradle.kts | 2 +- multification-core/build.gradle.kts | 2 +- 9 files changed, 25 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 4a83d2c..ca89bb4 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -5,4 +5,13 @@ object Versions { const val ADVENTURE_API = "4.18.0-SNAPSHOT" const val CDN = "1.14.5" + const val MOCKITO_CORE = "5.12.0" + const val JUNIT_JUPITER = "5.10.2" + const val ASSERTJ_CORE = "3.26.0" + const val AWAITILITY = "4.2.1" + + const val SPIGOT_API = "1.19.4-R0.1-SNAPSHOT" + + const val JETBRAINS_ANNOTATIONS = "24.1.0" + } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/multification-java-17.gradle.kts b/buildSrc/src/main/kotlin/multification-java-17.gradle.kts index b42d870..1edf928 100644 --- a/buildSrc/src/main/kotlin/multification-java-17.gradle.kts +++ b/buildSrc/src/main/kotlin/multification-java-17.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("java-library") + `java-library` } java { diff --git a/buildSrc/src/main/kotlin/multification-java-unit-test.gradle.kts b/buildSrc/src/main/kotlin/multification-java-unit-test.gradle.kts index 1972ded..9598054 100644 --- a/buildSrc/src/main/kotlin/multification-java-unit-test.gradle.kts +++ b/buildSrc/src/main/kotlin/multification-java-unit-test.gradle.kts @@ -1,14 +1,14 @@ plugins { - id("java-library") + `java-library` } dependencies { - testImplementation("org.mockito:mockito-core:5.12.0") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") - testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.2") - testImplementation("org.assertj:assertj-core:3.26.0") - testImplementation("org.awaitility:awaitility:4.2.1") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2") + testImplementation("org.mockito:mockito-core:${Versions.MOCKITO_CORE}") + testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT_JUPITER}") + testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT_JUPITER}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT_JUPITER}") + testImplementation("org.assertj:assertj-core:${Versions.ASSERTJ_CORE}") + testImplementation("org.awaitility:awaitility:${Versions.AWAITILITY}") } tasks.getByName("test") { diff --git a/buildSrc/src/main/kotlin/multification-java.gradle.kts b/buildSrc/src/main/kotlin/multification-java.gradle.kts index 7a924e6..3faf415 100644 --- a/buildSrc/src/main/kotlin/multification-java.gradle.kts +++ b/buildSrc/src/main/kotlin/multification-java.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("java-library") + `java-library` } java { diff --git a/buildSrc/src/main/kotlin/multification-publish.gradle.kts b/buildSrc/src/main/kotlin/multification-publish.gradle.kts index 932f066..ec95582 100644 --- a/buildSrc/src/main/kotlin/multification-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/multification-publish.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("java-library") - id("maven-publish") + `java-library` + `maven-publish` } group = "com.eternalcode" diff --git a/buildSrc/src/main/kotlin/multification-repositories.gradle.kts b/buildSrc/src/main/kotlin/multification-repositories.gradle.kts index 0e8c70a..aedf61f 100644 --- a/buildSrc/src/main/kotlin/multification-repositories.gradle.kts +++ b/buildSrc/src/main/kotlin/multification-repositories.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("java-library") + `java-library` } repositories { diff --git a/multification-bukkit/build.gradle.kts b/multification-bukkit/build.gradle.kts index fa0cee9..9b0e0d5 100644 --- a/multification-bukkit/build.gradle.kts +++ b/multification-bukkit/build.gradle.kts @@ -8,6 +8,6 @@ plugins { dependencies { api(project(":multification-core")) - compileOnly("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT") - testImplementation("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT") + compileOnly("org.spigotmc:spigot-api:${Versions.SPIGOT_API}") + testImplementation("org.spigotmc:spigot-api:${Versions.SPIGOT_API}") } \ No newline at end of file diff --git a/multification-cdn/build.gradle.kts b/multification-cdn/build.gradle.kts index 4980587..a133343 100644 --- a/multification-cdn/build.gradle.kts +++ b/multification-cdn/build.gradle.kts @@ -12,6 +12,6 @@ dependencies { api("net.dzikoysk:cdn:${Versions.CDN}") testImplementation(project(":multification-bukkit")) - testImplementation("org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT") + testImplementation("org.spigotmc:spigot-api:${Versions.SPIGOT_API}") testImplementation("net.kyori:adventure-api:${Versions.ADVENTURE_API}") } diff --git a/multification-core/build.gradle.kts b/multification-core/build.gradle.kts index 3f1e70b..a4a20f7 100644 --- a/multification-core/build.gradle.kts +++ b/multification-core/build.gradle.kts @@ -8,7 +8,7 @@ plugins { dependencies { compileOnlyApi("net.kyori:adventure-api:${Versions.ADVENTURE_API}") - api("org.jetbrains:annotations:24.1.0") + api("org.jetbrains:annotations:${Versions.JETBRAINS_ANNOTATIONS}") testImplementation("net.kyori:adventure-api:${Versions.ADVENTURE_API}") } \ No newline at end of file