Skip to content

Commit

Permalink
bumped gradle to 8.5 (#673)
Browse files Browse the repository at this point in the history
Signed-off-by: Andre Dietisheim <[email protected]>
  • Loading branch information
adietish committed Dec 5, 2023
1 parent 2ff9243 commit cc3d80c
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 29 deletions.
33 changes: 9 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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"
}

Expand Down Expand Up @@ -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}",
Expand All @@ -80,6 +79,12 @@ dependencies {
)
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(java_version)
}
}

configurations {
implementation {
exclude group: "org.slf4j", module: "slf4j-api"
Expand All @@ -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
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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/.
Expand All @@ -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"'
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%

Expand Down
4 changes: 4 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
plugins {
id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0"
}

0 comments on commit cc3d80c

Please sign in to comment.