GH-164 Normalize gradle architecture. (#166)

* Normalize gradle architecture.

* Add missing version placeholder.

buildSrc/build.gradle.kts

@@ -13,3 +13,17 @@ dependencies {
     implementation("net.minecrell:plugin-yml:0.6.0")
     implementation("xyz.jpenilla:run-task:2.2.4")
 }
+
+sourceSets {
+    main {
+        java.setSrcDirs(emptyList<String>())
+        groovy.setSrcDirs(emptyList<String>())
+        resources.setSrcDirs(emptyList<String>())
+    }
+    test {
+        java.setSrcDirs(emptyList<String>())
+        kotlin.setSrcDirs(emptyList<String>())
+        groovy.setSrcDirs(emptyList<String>())
+        resources.setSrcDirs(emptyList<String>())
+    }
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -0,0 +1,31 @@
+object Versions {
+
+    const val SPIGOT_API = "1.17.1-R0.1-SNAPSHOT"
+
+    const val JUNIT_JUPITER_API = "5.10.2"
+    const val JUNIT_JUPITER_PARAMS = "5.10.2"
+    const val JUNIT_JUPITER_ENGINE = "5.10.2"
+
+    const val ADVENTURE_PLATFORM_BUKKIT = "4.3.2"
+    const val ADVENTURE_TEXT_MINIMESSAGE = "4.16.0"
+
+    const val LITE_COMMANDS = "2.8.9"
+    const val OKAERI_CONFIGS_YAML_BUKKIT = "5.0.1"
+    const val OKAERI_CONFIGS_SERDES_COMMONS = "5.0.1"
+    const val OKAERI_CONFIGS_SERDES_BUKKIT = "5.0.1"
+
+    const val PANDA_UTILITIES = "0.5.2-alpha"
+    const val GIT_CHECK = "1.0.0"
+    const val APACHE_COMMONS = "2.16.1"
+
+    const val CAFFEINE = "3.1.8"
+
+    const val B_STATS_BUKKIT = "3.0.2"
+    const val WORLD_GUARD_BUKKIT = "7.0.9"
+
+}
+
+
+
+
+

buildSrc/src/main/kotlin/eternalcombat-java-unit-test.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    `java-library`
+}
+
+dependencies {
+    testImplementation("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT_JUPITER_API}")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT_JUPITER_PARAMS}")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT_JUPITER_ENGINE}")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+
+sourceSets.test {
+    java.setSrcDirs(listOf("test"))
+    resources.setSrcDirs(emptyList<String>())
+}

buildSrc/src/main/kotlin/eternalcombat.java.gradle.kts → buildSrc/src/main/kotlin/eternalcombat-java.gradle.kts

@@ -6,6 +6,11 @@ plugins {
 group = "com.eternalcode"
 version = "1.2.2"
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 checkstyle {
     toolVersion = "10.16.0"
 
@@ -26,23 +31,6 @@ configurations.named("checkstyle") {
     }
 }
 
-repositories {
-    mavenCentral()
-
-    maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") }
-    maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
-    maven { url = uri("https://repo.eternalcode.pl/releases") }
-    maven { url = uri("https://storehouse.okaeri.eu/repository/maven-public/") }
-    maven { url = uri("https://repo.panda-lang.org/releases") }
-    maven { url = uri("https://maven.enginehub.org/repo/") }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
 tasks.compileJava {
-    options.compilerArgs = listOf("-Xlint:deprecation", "-parameters")
     options.encoding = "UTF-8"
 }

buildSrc/src/main/kotlin/eternalcombat-publish.gradle.kts

@@ -0,0 +1,34 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+group = "com.eternalcode"
+version = "1.2.2"
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            artifactId = "eternalcombat-api"
+            from(project.components["java"])
+        }
+    }
+
+    repositories {
+        mavenLocal()
+        maven {
+            name = "eternalcodeReleases"
+            url = uri("https://repo.eternalcode.pl/releases")
+            credentials {
+                username = System.getenv("ETERNAL_CODE_MAVEN_USERNAME")
+                password = System.getenv("ETERNAL_CODE_MAVEN_PASSWORD")
+            }
+        }
+    }
+}
+

buildSrc/src/main/kotlin/eternalcombat-repositories.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    `java-library`
+}
+
+repositories {
+    mavenCentral()
+
+    maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") }
+    maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
+    maven { url = uri("https://repo.eternalcode.pl/releases") }
+    maven { url = uri("https://storehouse.okaeri.eu/repository/maven-public/") }
+    maven { url = uri("https://repo.panda-lang.org/releases") }
+    maven { url = uri("https://maven.enginehub.org/repo/") }
+}

eternalcombat-api/build.gradle.kts

@@ -1,81 +1,42 @@
 plugins {
-    id("eternalcombat.java")
-
-    `maven-publish`
+    `eternalcombat-java`
+    `eternalcombat-repositories`
+    `eternalcombat-publish`
+    `eternalcombat-java-unit-test`
 }
 
 dependencies {
     // Spigot api
-    compileOnlyApi(libs.spigotApi)
+    compileOnlyApi("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
 
     // kyori
-    api(libs.adventurePlatformBukkit)
-    api(libs.adventureTextMinimessage)
+    api("net.kyori:adventure-platform-bukkit:${Versions.ADVENTURE_PLATFORM_BUKKIT}")
+    api("net.kyori:adventure-text-minimessage:${Versions.ADVENTURE_TEXT_MINIMESSAGE}")
 
     // litecommands
-    api(libs.liteCommands)
+    api("dev.rollczi.litecommands:bukkit-adventure:${Versions.LITE_COMMANDS}")
 
     // Okaeri configs
-    api(libs.okaeriConfigsYamlBukkit)
-    api(libs.okaeriConfigsSerdesCommons)
-    api(libs.okaeriConfigsSerdesBukkit)
+    api("eu.okaeri:okaeri-configs-yaml-bukkit:${Versions.OKAERI_CONFIGS_YAML_BUKKIT}")
+    api("eu.okaeri:okaeri-configs-serdes-commons:${Versions.OKAERI_CONFIGS_SERDES_COMMONS}")
+    api("eu.okaeri:okaeri-configs-serdes-bukkit:${Versions.OKAERI_CONFIGS_SERDES_BUKKIT}")
 
     // Panda utilities
-    api(libs.pandaUtilities)
+    api("org.panda-lang:panda-utilities:${Versions.PANDA_UTILITIES}")
 
     // GitCheck
-    api(libs.gitCheck)
+    api("com.eternalcode:gitcheck:${Versions.GIT_CHECK}")
 
     // commons
-    api(libs.apacheCommons)
+    api("commons-io:commons-io:${Versions.APACHE_COMMONS}")
 
     // bstats
-    api(libs.bStatsBukkit)
+    api("org.bstats:bstats-bukkit:${Versions.B_STATS_BUKKIT}")
 
     // caffeine
-    api(libs.caffeine)
+    api("com.github.ben-manes.caffeine:caffeine:${Versions.CAFFEINE}")
 
     // worldguard
-    compileOnly(libs.worldGuardBukkit)
-
-    // tests
-    testImplementation(libs.spigotApi)
-    testImplementation(libs.jUnitJupiterApi)
-    testImplementation(libs.jUnitJupiterParams)
-    testRuntimeOnly(libs.jUnitJupiterEngine)
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-tasks.getByName<Test>("test") {
-    useJUnitPlatform()
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            artifactId = "eternalcombat-api"
-            from(project.components["java"])
-        }
-    }
+    api("com.sk89q.worldguard:worldguard-bukkit:${Versions.WORLD_GUARD_BUKKIT}")
 
-    repositories {
-        mavenLocal()
-        maven {
-            name = "eternalcodeReleases"
-            url = uri("https://repo.eternalcode.pl/releases")
-            credentials {
-                username = System.getenv("ETERNAL_CODE_MAVEN_USERNAME")
-                password = System.getenv("ETERNAL_CODE_MAVEN_PASSWORD")
-            }
-        }
-    }
 }

eternalcombat-plugin/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
-    id("eternalcombat.java")
+    `eternalcombat-java`
+    `eternalcombat-repositories`
 
     id("net.minecrell.plugin-yml.bukkit")
     id("com.github.johnrengelman.shadow")