gradle 8.1, no k2

a-sit-plus · Aug 11, 2023 · 4c46edf · 4c46edf
1 parent a4e48a8
commit 4c46edf
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/conventions-vclib/gradle-conventions-plugin b/conventions-vclib/gradle-conventions-plugin
diff --git a/gradle.properties b/gradle.properties
@@ -13,6 +13,6 @@ kotlin.mpp.stability.nowarn=true
 kotlin.native.binary.memoryModel=experimental
 kotlin.native.binary.freezing=disabled
 kotlin.native.ignoreDisabledTargets=true
-kotlin.experimental.tryK2=true
+kotlin.experimental.tryK2=false
 
 artifactVersion = 2.1.0-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.3-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum