bumped gradle to 8.5 (redhat-developer#673)

Signed-off-by: Andre Dietisheim <[email protected]>
adietish · Dec 6, 2023 · 40605f7 · 40605f7
1 parent 2ff9243
commit 40605f7
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,10 +10,10 @@ buildscript {
         ext.sinceIdeaBuild = "${since.group(1)}${since.group(2)}".toInteger()
     }
 
-    if (ext.sinceIdeaBuild >= 223) {
+    if (ext.sinceIdeaBuild.toInteger() >= 223) {
         ext.kotlinVersion = kotlinVersionIdea221
         ext.java_version = "17"
-    } else if (ext.sinceIdeaBuild >= 221) {
+    } else if (ext.sinceIdeaBuild.toInteger() >= 221) {
         ext.kotlinVersion = kotlinVersionIdea221
         ext.java_version = "11"
     } else {
@@ -24,7 +24,7 @@ buildscript {
 
 plugins {
     id "org.jetbrains.intellij" version "${intellijPluginVersion}"
-    id "org.jetbrains.kotlin.jvm" version "1.8.0"
+    id "org.jetbrains.kotlin.jvm" version "${kotlinJvmPluginVersion}"
     id "idea"
 }
 
@@ -53,7 +53,6 @@ tasks.withType(Test) {
 
 dependencies {
     implementation(
-            "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}",
             "com.redhat.devtools.intellij:intellij-common:${intellijCommonVersion}",
             "io.fabric8:kubernetes-client:${kubernetesClientVersion}",
             "io.fabric8:kubernetes-model:${kubernetesClientVersion}",
@@ -80,6 +79,12 @@ dependencies {
     )
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(java_version)
+    }
+}
+
 configurations {
     implementation {
         exclude group: "org.slf4j", module: "slf4j-api"
@@ -91,26 +96,6 @@ configurations {
         targetCompatibility = java_version
     }
 
-    compileKotlin {
-        kotlinOptions {
-            if (java_version == "17") {
-                jvmTarget = "17"
-            } else {
-                jvmTarget = "11"
-            }
-        }
-    }
-
-    compileTestKotlin {
-        kotlinOptions {
-            if (java_version == "17") {
-                jvmTarget = "17"
-            } else {
-                jvmTarget = "11"
-            }
-        }
-    }
-
     integrationTestImplementation.extendsFrom testImplementation
     integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
 }

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,8 @@ sinceIdeaBuild=232
 projectVersion=1.2.2-SNAPSHOT
 jetBrainsToken=invalid
 jetBrainsChannel=stable
-intellijPluginVersion=1.16.0
+intellijPluginVersion=1.16.1
+kotlinJvmPluginVersion=1.8.0
 intellijCommonVersion=1.9.3-SNAPSHOT
 telemetryPluginVersion=1.0.0.44
 kotlin.stdlib.default.dependency = false

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,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 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"'
@@ -143,12 +143,16 @@ fi
 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 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/gradlew.bat b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,4 @@
+plugins {
+    id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0"
+}
+