From 92e8acf2ee62bc842bd19878666f69ca4873175e Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Sun, 25 Aug 2024 18:22:11 +0200 Subject: [PATCH] Set correct java version and undo gradle properties again --- .github/workflows/release.yml | 2 +- gradle.properties | 5 +---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f7cd6ce450..de3e2ef796d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,6 @@ jobs: release: uses: Thodor12/operapublicacreator/.github/workflows/gradle.release.yaml@port/gh_updates_ng7 with: - java: 17 + java: 21 curse_release_type: ${{ contains(github.ref, 'release') && 'release' || 'beta' }} secrets: inherit \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4119aa61c2d..be36983659f 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,5 @@ org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=true -org.gradle.parallel=true -org.gradle.caching=true -org.gradle.configuration-cache=true +org.gradle.daemon=false modId=minecolonies modGroup=com.ldtteam diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e549..9355b415575 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-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME