From 7a703ad091800de5e811fa04f2b36f58026667b7 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 11 Apr 2021 14:15:13 -0700 Subject: [PATCH 1/3] add publication config to Fabric --- platforms/fabric/build.gradle.kts | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index bde8a8d1a..9d4597bc5 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -6,6 +6,7 @@ import net.fabricmc.loom.task.RemapJarTask plugins { `java-library` + `maven-publish` id("fabric-loom").version("0.6-SNAPSHOT") id("com.modrinth.minotaur").version("1.1.0") } @@ -63,4 +64,28 @@ tasks.register("publishModrinth") { addGameVersion("1.16.4") addGameVersion("1.16.5") addLoader("fabric") +} + +publishing { + publications { + create("mavenJava") { + artifact(tasks["sourcesJar"]) + artifact(tasks["jar"]) + } + } + + repositories { + val mavenUrl = "https://repo.codemc.io/repository/maven-releases/" + + 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 From 01d169256e0fb1260cc9c4f27e8098c0b2c1163f Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 11 Apr 2021 17:49:39 -0700 Subject: [PATCH 2/3] properly relocate dependencies --- .../main/kotlin/com/dfsek/terra/DependencyConfig.kt | 4 +--- .../main/kotlin/com/dfsek/terra/DistributionConfig.kt | 8 +++++++- common/build.gradle.kts | 3 ++- platforms/bukkit/build.gradle.kts | 10 ++-------- platforms/fabric/build.gradle.kts | 7 ------- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt index bdcada325..4bab053e4 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt @@ -18,9 +18,7 @@ fun Project.configureDependencies() { dependencies { "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.7.0") - "testImplementation"("org.yaml:snakeyaml:1.27") - "testImplementation"("com.googlecode.json-simple:json-simple:1.1.1") - "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.7.0") + "testImplementation"("org.junit.jupiter:junit-jupiter-engine:5.7.0") "compileOnly"("org.jetbrains:annotations:20.1.0") } } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt index aeb306888..c874d8820 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt @@ -62,8 +62,14 @@ fun Project.configureDistribution() { archiveClassifier.set("shaded") setVersion(project.version) relocate("org.apache.commons", "com.dfsek.terra.lib.commons") - relocate("parsii", "com.dfsek.terra.lib.parsii") relocate("net.jafama", "com.dfsek.terra.lib.jafama") + relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm") + relocate("com.google.errorprone", "com.dfsek.terra.lib.google.errorprone") + relocate("com.google.j2objc", "com.dfsek.terra.lib.google.j2objc") + relocate("org.checkerframework", "com.dfsek.terra.lib.checkerframework") + relocate("org.javax.annotation", "com.dfsek.terra.lib.javax.annotation") + relocate("org.json", "com.dfsek.terra.lib.json") + relocate("org.yaml", "com.dfsek.terra.lib.yaml") minimize() } convention.getPlugin().archivesBaseName = project.name diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 5938324de..ec58b60e9 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -20,7 +20,8 @@ dependencies { "shadedApi"("org.ow2.asm:asm:9.0") "shadedApi"("commons-io:commons-io:2.6") - "compileOnly"("com.googlecode.json-simple:json-simple:1.1") + "shadedApi"("com.googlecode.json-simple:json-simple:1.1.1") + "shadedApi"("org.yaml:snakeyaml:1.27") "compileOnly"("com.google.guava:guava:30.0-jre") diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 3b477791b..6e8f30a0e 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -22,13 +22,6 @@ val testMem = "3G" val paperURL = "https://papermc.io/api/v1/paper/%version%/latest/download/" val purpurURL = "https://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/artifact/final/purpurclip.jar" -repositories { - mavenCentral() - maven { url = uri("http://maven.enginehub.org/repo/") } - maven { url = uri("https://repo.codemc.org/repository/maven-public") } - maven { url = uri("https://papermc.io/repo/repository/maven-public/") } -} - dependencies { "shadedApi"(project(":common")) @@ -39,7 +32,7 @@ dependencies { "compileOnly"("com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT") - "shadedImplementation"("com.google.guava:guava:30.0-jre") + "shadedApi"("com.google.guava:guava:30.0-jre") } val jvmFlags = listOf("-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200", @@ -189,6 +182,7 @@ task(name = "runPurpur") { tasks.named("shadowJar") { relocate("org.bstats.bukkit", "com.dfsek.terra.lib.bstats") relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib") + relocate("com.google.common", "com.dfsek.terra.lib.google.common") } publishing { diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index bde8a8d1a..cd9555463 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -21,8 +21,6 @@ group = "com.dfsek.terra.fabric" dependencies { "shadedApi"(project(":common")) - "shadedImplementation"("org.yaml:snakeyaml:1.27") - "shadedImplementation"("com.googlecode.json-simple:json-simple:1.1.1") "minecraft"("com.mojang:minecraft:1.16.5") "mappings"("net.fabricmc:yarn:1.16.5+build.5:v2") @@ -31,11 +29,6 @@ dependencies { "modImplementation"("net.fabricmc.fabric-api:fabric-api:0.31.0+1.16") } -tasks.named("shadowJar") { - relocate("org.json", "com.dfsek.terra.lib.json") - relocate("org.yaml", "com.dfsek.terra.lib.yaml") -} - configure { accessWidener("src/main/resources/terra.accesswidener") From 9f4f9702a68818223fb19f2ea215c11426fa1a84 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 11 Apr 2021 17:54:07 -0700 Subject: [PATCH 3/3] bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1e189b37b..8d567f9d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ import com.dfsek.terra.getGitHash -val versionObj = Version("5", "1", "2", true) +val versionObj = Version("5", "1", "3", true) allprojects { version = versionObj