Skip to content

Commit

Permalink
SLI-1385 Update to Gradle 8 (#1122)
Browse files Browse the repository at this point in the history
  • Loading branch information
nquinquenel authored Aug 8, 2024
1 parent 9b58960 commit 2d3593a
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
SONAR_HOST_URL: VAULT[development/kv/data/next data.url]
SONAR_TOKEN: VAULT[development/kv/data/next data.token]
SLACK_TOKEN: VAULT[development/kv/data/slack data.token]
GRADLE_VERSION: "7.6.4"
GRADLE_VERSION: "8.9"
GRADLE_USER_HOME: ${CIRRUS_WORKING_DIR}/.gradle_cache

auto_cancellation: $CIRRUS_BRANCH != $CIRRUS_DEFAULT_BRANCH
Expand Down Expand Up @@ -43,7 +43,7 @@ orchestrator_monthly_cache_template: &ORCHESTRATOR_MONTHLY_CACHE_TEMPLATE
fingerprint_script: echo ${THIS_MONTH}

eks_container: &CONTAINER_DEFINITION
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j11-g7-latest
image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-g7-latest
region: eu-central-1
cluster_name: ${CIRRUS_CLUSTER_NAME}
namespace: default
Expand Down
9 changes: 3 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
import org.jetbrains.intellij.tasks.RunPluginVerifierTask

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
alias(libs.plugins.kotlin)
alias(libs.plugins.intellij)
Expand Down Expand Up @@ -55,6 +54,8 @@ allprojects {
plugin("com.github.hierynomus.license")
}

configurations.archives.get().isCanBeResolved = true

repositories {
maven("https://repox.jfrog.io/repox/sonarsource") {
if (artifactoryUsername.isNotEmpty() && artifactoryPassword.isNotEmpty()) {
Expand Down Expand Up @@ -85,6 +86,7 @@ allprojects {
}
}


tasks.cyclonedxBom {
setIncludeConfigs(listOf("runtimeClasspath", "sqplugins_deps"))
inputs.files(configurations.runtimeClasspath, configurations.archives.get())
Expand Down Expand Up @@ -161,11 +163,6 @@ tasks.runPluginVerifier {
}

tasks.test {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
useJUnitPlatform()
systemProperty("sonarlint.telemetry.disabled", "true")
}
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ clionBuildVersion=CL-2022.3.1
clionResharperBuildVersion=RD-2024.1
intellijBuildVersion=IC-2022.3.1
omnisharpVersion=1.39.10
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=512M
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=512M -Dfile.encoding=UTF-8
org.gradle.caching=true
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.configureondemand=true
kotlin.stdlib.default.dependency=false
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sonar-cpp = "6.57.0.73017"

sonarqube = "4.4.1.3373"

kotlin-plugin = "1.9.22"
kotlin-plugin = "1.9.23"
intellij-plugin = "1.17.2"
license-plugin = "0.16.1"
artifactory-plugin = "4.33.1"
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.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.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ buildCache {
isPush = isMasterBranch
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
}

0 comments on commit 2d3593a

Please sign in to comment.