diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 4a1a7c3..bc73d69 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -15,11 +15,11 @@ jobs: - name: Checkout latest code uses: actions/checkout@v2 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 17 + java-version: 21 - name: Change wrapper permissions run: chmod +x ./gradlew diff --git a/build.gradle.kts b/build.gradle.kts index 7a25640..ddd6963 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { `java-library` `maven-publish` kotlin("jvm") version "1.9.20" - id("com.github.johnrengelman.shadow") version "8.0.0" + id("io.github.goooler.shadow") version "8.1.7" id("com.willfp.libreforge-gradle-plugin") version "1.0.0" } @@ -25,7 +25,7 @@ allprojects { apply(plugin = "java") apply(plugin = "kotlin") apply(plugin = "maven-publish") - apply(plugin = "com.github.johnrengelman.shadow") + apply(plugin = "io.github.goooler.shadow") repositories { mavenLocal() @@ -44,7 +44,7 @@ allprojects { java { withSourcesJar() - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } tasks { @@ -54,7 +54,7 @@ allprojects { compileKotlin { kotlinOptions { - jvmTarget = "17" + jvmTarget = "21" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1bef7e..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index caba981..0000000 --- a/jitpack.yml +++ /dev/null @@ -1,6 +0,0 @@ -jdk: openjdk17 -before_install: - - source "$HOME/.sdkman/bin/sdkman-init.sh" - - sdk update - - sdk install java 17.0.1-tem - - sdk use java 17.0.1-tem \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 3862cb3..90a9bd2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,11 +2,15 @@ pluginManagement { repositories { gradlePluginPortal() mavenLocal() - maven("https://repo.jpenilla.xyz/snapshots/") maven("https://repo.auxilor.io/repository/maven-public/") + maven("https://repo.papermc.io/repository/maven-public/") } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + rootProject.name = "EcoItems" // Core