From 5c16f1bc1316d6aa1149a2f0ac3d3fdb0e6a33af Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Thu, 9 Jan 2025 16:19:19 +0800 Subject: [PATCH] updated Gradle to 8.12 --- .gitea/workflows/build.yaml | 5 +++++ gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- .../java/net/woggioni/gradle/sambal/attribute/Sealing.java | 5 ++--- .../java/net/woggioni/gradle/sambal/attribute/Signing.java | 5 ++--- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5d29c8c..39dbdc6 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -8,6 +8,11 @@ jobs: steps: - name: Checkout sources uses: actions/checkout@v4 + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 21 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - name: Execute Gradle build diff --git a/gradle.properties b/gradle.properties index c49ff61..8b2014c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -lys.catalog.version=2024.12.28 -version.myGradlePlugins=2024.12.29 -version.gradle=8.11.1 +lys.catalog.version=2025.01.08 +version.myGradlePlugins=2025.01.08 +version.gradle=8.12 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..e0fd020 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.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Sealing.java b/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Sealing.java index 0d79410..c22ccd1 100644 --- a/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Sealing.java +++ b/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Sealing.java @@ -6,7 +6,6 @@ import org.gradle.api.attributes.AttributeCompatibilityRule; import org.gradle.api.attributes.AttributeDisambiguationRule; import org.gradle.api.attributes.CompatibilityCheckDetails; import org.gradle.api.attributes.MultipleCandidatesDetails; -import org.gradle.api.internal.ReusableAction; import java.util.Arrays; import java.util.Comparator; @@ -19,7 +18,7 @@ public interface Sealing extends Named { String sealed = "sealed"; String open = "open"; - class CompatibilityRules implements AttributeCompatibilityRule, ReusableAction { + class CompatibilityRules implements AttributeCompatibilityRule { public void execute(CompatibilityCheckDetails details) { Sealing consumerValue = details.getConsumerValue(); Sealing producerValue = details.getProducerValue(); @@ -35,7 +34,7 @@ public interface Sealing extends Named { } } - class DisambiguationRules implements AttributeDisambiguationRule, ReusableAction { + class DisambiguationRules implements AttributeDisambiguationRule { private static final List ORDER = Arrays.asList(open, sealed); private static final Comparator comparator = Comparator.comparingInt(sealing -> ORDER.indexOf(sealing.getName())); diff --git a/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Signing.java b/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Signing.java index caa7f49..92a3b12 100644 --- a/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Signing.java +++ b/sambal/src/main/java/net/woggioni/gradle/sambal/attribute/Signing.java @@ -6,7 +6,6 @@ import org.gradle.api.attributes.AttributeCompatibilityRule; import org.gradle.api.attributes.AttributeDisambiguationRule; import org.gradle.api.attributes.CompatibilityCheckDetails; import org.gradle.api.attributes.MultipleCandidatesDetails; -import org.gradle.api.internal.ReusableAction; import java.util.Arrays; import java.util.Comparator; @@ -19,7 +18,7 @@ public interface Signing extends Named { String signed = "signed"; String unsigned = "unsigned"; - class CompatibilityRules implements AttributeCompatibilityRule, ReusableAction { + class CompatibilityRules implements AttributeCompatibilityRule { public void execute(CompatibilityCheckDetails details) { Signing consumerValue = details.getConsumerValue(); Signing producerValue = details.getProducerValue(); @@ -35,7 +34,7 @@ public interface Signing extends Named { } } - class DisambiguationRules implements AttributeDisambiguationRule, ReusableAction { + class DisambiguationRules implements AttributeDisambiguationRule { private static final List ORDER = Arrays.asList(unsigned, signed); private static final Comparator comparator = Comparator.comparingInt(signing -> ORDER.indexOf(signing.getName()));