From 7cd60d6d4e9a26d29b52fc2a066bb5bf9c9b3223 Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 29 Jun 2021 19:21:12 -0700 Subject: [PATCH] set up modules for addon/config loaders --- .../addon}/build.gradle.kts | 1 - common/loader/config/build.gradle.kts | 59 +++++++++++++++++++ settings.gradle.kts | 3 +- 3 files changed, 61 insertions(+), 2 deletions(-) rename common/{platform => loader/addon}/build.gradle.kts (96%) create mode 100644 common/loader/config/build.gradle.kts diff --git a/common/platform/build.gradle.kts b/common/loader/addon/build.gradle.kts similarity index 96% rename from common/platform/build.gradle.kts rename to common/loader/addon/build.gradle.kts index 7c1ecd52c..d6f23e57a 100644 --- a/common/platform/build.gradle.kts +++ b/common/loader/addon/build.gradle.kts @@ -14,7 +14,6 @@ group = "com.dfsek.terra.common" dependencies { "shadedApi"(project(":common:api")) - "shadedApi"(project(":common:implementation")) "shadedApi"("org.apache.commons:commons-rng-core:1.3") "shadedApi"("commons-io:commons-io:2.4") diff --git a/common/loader/config/build.gradle.kts b/common/loader/config/build.gradle.kts new file mode 100644 index 000000000..d6f23e57a --- /dev/null +++ b/common/loader/config/build.gradle.kts @@ -0,0 +1,59 @@ +import com.dfsek.terra.configureCompilation +import com.dfsek.terra.configureDependencies + +plugins { + `java-library` + `maven-publish` + idea +} + +configureCompilation() +configureDependencies() + +group = "com.dfsek.terra.common" + +dependencies { + "shadedApi"(project(":common:api")) + + "shadedApi"("org.apache.commons:commons-rng-core:1.3") + "shadedApi"("commons-io:commons-io:2.4") + + "shadedApi"("com.dfsek:Paralithic:0.3.2") + "shadedApi"("com.dfsek:Tectonic:1.4.0") + "shadedApi"("net.jafama:jafama:2.3.2") + "shadedApi"("org.yaml:snakeyaml:1.27") + "shadedApi"("org.ow2.asm:asm:9.0") + "shadedApi"("commons-io:commons-io:2.6") + + "shadedApi"("com.googlecode.json-simple:json-simple:1.1.1") + "shadedApi"("org.yaml:snakeyaml:1.27") + + "compileOnly"("com.google.guava:guava:30.0-jre") + + "testImplementation"("com.google.guava:guava:30.0-jre") +} + +publishing { + publications { + create("mavenJava") { + artifact(tasks["sourcesJar"]) + artifact(tasks["jar"]) + } + } + + repositories { + val mavenUrl = "https://repo.codemc.io/repository/maven-releases/" + val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/" + + maven(mavenUrl) { + val mavenUsername: String? by project + val mavenPassword: String? by project + if (mavenUsername != null && mavenPassword != null) { + credentials { + username = mavenUsername + password = mavenPassword + } + } + } + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 69a622230..714b5e431 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,7 +10,8 @@ rootProject.name = "Terra" include("common:api") include("common:implementation") -include("common:platform") +include("common:loader:config") +include("common:loader:addon") include("platforms:bukkit")