User: rednesto Date: 08 Jul 23 15:56 Revision: 4b2804e814d5c4df5037b737755b8717ce656847 Summary: Bump Gradle 6.2, Kotlin 1.9 & GIJP 1.15.0 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8602&personal=false The following binary files were skipped: gradle/wrapper/gradle-wrapper.jar Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 315a7cf39c227e0c9fd3a182cfe2c1f7986baabd) +++ build.gradle.kts (revision 4b2804e814d5c4df5037b737755b8717ce656847) @@ -29,12 +29,12 @@ import org.jlleitschuh.gradle.ktlint.tasks.KtLintFormatTask plugins { - kotlin("jvm") version "1.8.0" + kotlin("jvm") version "1.9.0" java mcdev groovy idea - id("org.jetbrains.intellij") version "1.14.1" + id("org.jetbrains.intellij") version "1.15.0" id("org.cadixdev.licenser") id("org.jlleitschuh.gradle.ktlint") version "10.3.0" } @@ -278,7 +278,7 @@ exclude("com/demonwav/mcdev/platform/mixin/invalidInjectorMethodSignature/*.java") - tasks { + this.tasks { register("gradle") { files.from( fileTree(project.projectDir) { Index: gradle/wrapper/gradle-wrapper.properties =================================================================== --- gradle/wrapper/gradle-wrapper.properties (revision 315a7cf39c227e0c9fd3a182cfe2c1f7986baabd) +++ gradle/wrapper/gradle-wrapper.properties (revision 4b2804e814d5c4df5037b737755b8717ce656847) @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists Index: gradlew =================================================================== --- gradlew (revision 315a7cf39c227e0c9fd3a182cfe2c1f7986baabd) +++ gradlew (revision 4b2804e814d5c4df5037b737755b8717ce656847) @@ -85,9 +85,6 @@ APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,18 +130,21 @@ fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." -fi + fi +fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,6 +197,10 @@ done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in