diff --git a/GILua/build.gradle.kts b/GILua/build.gradle.kts index 878b5fb..9de2aa5 100644 --- a/GILua/build.gradle.kts +++ b/GILua/build.gradle.kts @@ -1,14 +1,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("java-library") + `version-catalog` + `java-library` kotlin("jvm") - kotlin("plugin.lombok") version "1.9.22" - id("io.freefair.lombok") version "8.1.0" + alias(libs.plugins.kotlin.lombok) + alias(libs.plugins.lombok) } group = "org.anime_game_servers.lua" -version = "0.1" +version = libs.versions.anime.game.lua.get() repositories { mavenCentral() @@ -16,16 +17,15 @@ repositories { } dependencies { - testImplementation(platform("org.junit:junit-bom:5.9.1")) - testImplementation("org.junit.jupiter:junit-jupiter") - implementation("org.anime_game_servers.lua:base-jvm:0.1") - api("org.anime_game_servers.core:gi:0.1") - implementation("com.google.code.findbugs:jsr305:3.0.2") - implementation(kotlin("stdlib-jdk8")) - compileOnly("org.projectlombok:lombok:1.18.30") - annotationProcessor("org.projectlombok:lombok:1.18.30") - implementation("com.github.davidmoten:rtree-multi:0.1") - implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") + testImplementation(platform("org.junit:junit-bom:${libs.versions.junit}")) + testImplementation(libs.junit) + implementation(libs.jvm.kotlin.stdlib) + api(libs.bundles.jvm.ags.lua.gi) + implementation(libs.findbugs.jsr305) + implementation(libs.jvm.logging) + compileOnly(libs.jvm.lombok) + annotationProcessor(libs.jvm.lombok) + implementation(libs.jvm.rtree.multi) } tasks.withType().configureEach { compilerOptions { diff --git a/JNLuaEngine/build.gradle.kts b/JNLuaEngine/build.gradle.kts index a643d01..87fab67 100644 --- a/JNLuaEngine/build.gradle.kts +++ b/JNLuaEngine/build.gradle.kts @@ -1,28 +1,29 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("java-library") + `version-catalog` + `java-library` kotlin("jvm") } group = "org.anime_game_servers.lua" -version = "0.1" +version = libs.versions.anime.game.lua.get() repositories { mavenCentral() } dependencies { - testImplementation(platform("org.junit:junit-bom:5.9.1")) - testImplementation("org.junit.jupiter:junit-jupiter") - implementation("org.anime_game_servers.lua:base-jvm:0.1") - implementation("com.google.code.findbugs:jsr305:3.0.2") - implementation("org.anime_game_servers:JNLua_GC:0.1.0") - implementation(kotlin("stdlib-jdk8")) - compileOnly("org.projectlombok:lombok:1.18.30") - annotationProcessor("org.projectlombok:lombok:1.18.30") - implementation("com.esotericsoftware:reflectasm:1.11.9") - implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") + testImplementation(platform("org.junit:junit-bom:${libs.versions.junit}")) + testImplementation(libs.junit) + implementation(libs.jvm.kotlin.stdlib) + api(libs.bundles.jvm.ags.lua.engine) + implementation(libs.findbugs.jsr305) + implementation(libs.jvm.jnlua) + compileOnly(libs.jvm.lombok) + annotationProcessor(libs.jvm.lombok) + implementation(libs.bundles.jvm.reflection) + implementation(libs.jvm.logging) } tasks.test { @@ -37,6 +38,11 @@ compileTestKotlin.kotlinOptions { jvmTarget = "17" } +java { + withSourcesJar() + withJavadocJar() +} + publishing { publications { create("maven") { diff --git a/LuaJEngine/build.gradle.kts b/LuaJEngine/build.gradle.kts index 34a777f..8c3c38c 100644 --- a/LuaJEngine/build.gradle.kts +++ b/LuaJEngine/build.gradle.kts @@ -1,34 +1,40 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("java-library") + `version-catalog` + `java-library` kotlin("jvm") } group = "org.anime_game_servers.lua" -version = "0.1" +version = libs.versions.anime.game.lua.get() repositories { mavenCentral() } dependencies { - testImplementation(platform("org.junit:junit-bom:5.9.1")) - testImplementation("org.junit.jupiter:junit-jupiter") - implementation("org.anime_game_servers.lua:base-jvm:0.1") - implementation("com.google.code.findbugs:jsr305:3.0.2") - implementation("org.anime_game_servers:luaj:3.0.3") - compileOnly("org.projectlombok:lombok:1.18.30") - annotationProcessor("org.projectlombok:lombok:1.18.30") - implementation("com.esotericsoftware:reflectasm:1.11.9") - implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") - implementation(kotlin("stdlib-jdk8")) + testImplementation(platform("org.junit:junit-bom:${libs.versions.junit}")) + testImplementation(libs.junit) + implementation(libs.jvm.kotlin.stdlib) + api(libs.bundles.jvm.ags.lua.engine) + implementation(libs.findbugs.jsr305) + implementation(libs.jvm.luaj) + compileOnly(libs.jvm.lombok) + annotationProcessor(libs.jvm.lombok) + implementation(libs.bundles.jvm.reflection) + implementation(libs.jvm.logging) } tasks.test { useJUnitPlatform() } +java { + withSourcesJar() + withJavadocJar() +} + publishing { publications { create("maven") { diff --git a/base/build.gradle.kts b/base/build.gradle.kts index e73604a..3f3b83b 100644 --- a/base/build.gradle.kts +++ b/base/build.gradle.kts @@ -1,9 +1,10 @@ plugins { + `version-catalog` kotlin("multiplatform") } group = "org.anime_game_servers.lua" -version = "0.1" +version = libs.versions.anime.game.lua.get() kotlin { jvm { @@ -43,20 +44,19 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - api("org.anime_game_servers.core:base:0.1") - implementation(kotlin("reflect")) + implementation(libs.ags.core.base) + implementation(libs.kotlin.reflect) + implementation(libs.logging) } } val commonTest by getting { } val jvmMain by getting { dependencies { - api("org.anime_game_servers.core:base-jvm:0.1") - implementation("io.github.oshai:kotlin-logging-jvm:5.1.0") - implementation("com.esotericsoftware:reflectasm:1.11.9") - implementation("com.google.code.findbugs:jsr305:3.0.2") - implementation(kotlin("reflect")) - implementation ("org.reflections:reflections:0.10.2") + implementation(libs.jvm.ags.core.base) + implementation(libs.bundles.jvm.reflection) + implementation(libs.findbugs.jsr305) + implementation(libs.jvm.logging) } } val jvmTest by getting diff --git a/build.gradle.kts b/build.gradle.kts index d0bb9a7..f6057b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { + `version-catalog` id("java") id("maven-publish") - kotlin("multiplatform") version "1.9.22" apply false + alias(libs.plugins.kotlin.multiplatform) apply false } group = "org.anime_game_servers" -version = "0.1" +version = libs.versions.anime.game.lua repositories { mavenCentral() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..fe132f5 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,66 @@ +[versions] +# https://kotlinlang.org/docs/releases.html#release-details +kotlin = "1.9.22" +# https://github.com/Kotlin/kotlinx-io/releases +kx_io = "0.3.0" +# https://github.com/oshai/kotlin-logging/releases +logger = "6.0.3" +# https://mvnrepository.com/artifact/com.esotericsoftware/reflectasm/1.11.9 // TODO not maintained anymore +reflectasm = "1.11.9" +# https://github.com/ronmamo/reflections/releases // TODO not maintained anymore +reflections = "0.10.2" +# https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305 +jsr305 = "3.0.2" +# https://projectlombok.org/download +lombok_libs = "1.18.30" +# https://plugins.gradle.org/plugin/io.freefair.lombok +lombok_plugin = "8.4" +# https://github.com/davidmoten/rtree-multi/releases +rtree_multi = "0.1" + +## testing libs +# https://github.com/junit-team/junit5/releases +junit = "5.10.1" + +## ags libs +# https://github.com/Hartie95/JNLua_GC +luaEngine_jnlua = "0.1.0" +# https://github.com/Hartie95/luaj +luaEngine_luaj = "3.0.3" +# https://github.com/Hartie95/Core +ags_core = "0.1" +anime_game_lua = "0.1" + +[libraries] +kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } +jvm-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } +kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kx_io" } +logging = { module = "io.github.oshai:kotlin-logging", version.ref = "logger" } +jvm-logging = { module = "io.github.oshai:kotlin-logging-jvm", version.ref = "logger" } +reflectasm = { module = "com.esotericsoftware:reflectasm", version.ref = "reflectasm" } +reflections = { module = "org.reflections:reflections", version.ref = "reflections" } +findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" } +jvm-lombok = { module = "org.projectlombok:lombok", version.ref = "lombok_libs" } +jvm-rtree-multi = { module = "com.github.davidmoten:rtree-multi", version.ref = "rtree_multi" } + +junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } + +jvm-jnlua = { module = "org.anime_game_servers:JNLua_GC", version.ref = "luaEngine_jnlua" } +jvm-luaj = { module = "org.anime_game_servers:luaj", version.ref = "luaEngine_luaj" } +ags-core-base = { module = "org.anime_game_servers.core:base", version.ref = "ags_core" } +jvm-ags-core-base = { module = "org.anime_game_servers.core:base-jvm", version.ref = "ags_core" } +ags-core-gi = { module = "org.anime_game_servers.core:gi", version.ref = "ags_core" } +jvm-ags-core-gi = { module = "org.anime_game_servers.core:gi-jvm", version.ref = "ags_core" } +jvm-ags-lua-base = { module = "org.anime_game_servers.lua:base-jvm", version.ref = "anime_game_lua" } + + +[bundles] +jvm-reflection = ["kotlin-reflect", "reflectasm", "reflections"] +jvm-ags-lua-gi = ["jvm-ags-core-base", "jvm-ags-core-gi", "jvm-ags-lua-base"] +jvm-ags-lua-engine = ["jvm-ags-core-base", "jvm-ags-core-gi", "jvm-ags-lua-base"] + +[plugins] +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-lombok = { id = "org.jetbrains.kotlin.plugin.lombok", version.ref = "kotlin" } +lombok = { id = "io.freefair.lombok", version.ref = "lombok_plugin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ