diff --git a/buildsystem-core/build.gradle.kts b/buildsystem-core/build.gradle.kts index 77f8fdaf..7d433fdc 100644 --- a/buildsystem-core/build.gradle.kts +++ b/buildsystem-core/build.gradle.kts @@ -48,17 +48,15 @@ dependencies { compileOnly(libs.worldedit) compileOnly(libs.axiompaper) - implementation(libs.paperlib) - implementation(libs.xseries) + implementation(libs.bouncycastle) + implementation(libs.bstats) + implementation(libs.bundles.aws) implementation(libs.fastboard) implementation(libs.nbt) { isTransitive = false } - implementation(libs.bstats) - implementation(libs.aws.core) // Unable to find the dependency at runtime, so we add it here - - library(libs.bundles.aws) - library(libs.bouncycastle) - library(libs.sftp) - library(libs.zip4j) + implementation(libs.paperlib) + implementation(libs.sftp) + implementation(libs.xseries) + implementation(libs.zip4j) } tasks.named("assemble") { @@ -69,12 +67,23 @@ tasks.named("shadowJar") { minimize() archiveFileName.set("${rootProject.name}-${project.version}.jar") - val shadePath = "de.eintosti.buildsystem.util.external" - relocate("io.papermc.lib", "$shadePath.paperlib") + val shadePath = "de.eintosti.buildsystem.external" relocate("com.cryptomorin.xseries", "$shadePath.xseries") - relocate("fr.mrmicky.fastboard", "$shadePath.fastboard") relocate("dev.dewy.nbt", "$shadePath.nbt") + relocate("fr.mrmicky.fastboard", "$shadePath.fastboard") + relocate("io.netty", "$shadePath.netty") + relocate("io.papermc.lib", "$shadePath.paperlib") + relocate("net.lingala.zip4j", "$shadePath.zip4j") + relocate("org.apache.commons.codec", "$shadePath.apache.commons.codec") + relocate("org.apache.commons.logging", "$shadePath.apache.commons.logging") + relocate("org.apache.http", "$shadePath.apache.http") + relocate("org.apache.sshd", "$shadePath.sshd") + relocate("org.bouncycastle", "$shadePath.bouncycastle") relocate("org.bstats", "$shadePath.bstats") + relocate("org.reactivestreams", "$shadePath.reactivestreams") + relocate("org.slf4j", "$shadePath.slf4j") + relocate("software.amazon.awssdk", "$shadePath.awssdk") + relocate("software.amazon.eventstream", "$shadePath.awssdk.eventstream") } tasks.processResources { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a44647eb..ae3a1a7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,14 +5,14 @@ paperlib = "1.0.8" # Plugins luckperms = "5.5" -worldedit = "7.4.2" +worldedit = "7.4.3" placeholderapi = "2.12.2" axiompaper = "4.0.1-1.21.1" # Third Party annotations = "26.1.0" authlib = "3.13.56" aws-sdk = "2.42.25" -bouncycastle = "1.83" +bouncycastle = "1.84" bstats = "3.2.1" fastboard = "2.1.5" jspecify = "1.0.0" @@ -49,9 +49,4 @@ zip4j = { group = "net.lingala.zip4j", name = "zip4j", version.ref = "zip4j" } xseries = { group = "com.github.cryptomorin", name = "XSeries", version.ref = "xseries" } [bundles] -aws = [ - "aws-s3", - "aws-auth", - "aws-regions", - # "aws-core", Unable to find the dependency at runtime -] \ No newline at end of file +aws = ["aws-s3", "aws-auth", "aws-regions", "aws-core"] \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118f..1a704683 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME