Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Upgrade to gradle 9.1 (#2060)

Eric Bariaux7ac7070d50e9
diff --git a/build.gradle b/build.gradle
index 45de61eb6..50fd2a4e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ allprojects {
// Each file must be explicitly added to .gitignore otherwise git commit will fail
// When using encryption the the GFE_PASSWORD environment variable must be set or the build will fail
// use ./gradlew encryptFiles to encrypt files
-apply plugin: 'com.cherryperry.gradle-file-encrypt'
+apply plugin: 'io.openremote.com.cherryperry.gradle-file-encrypt'
gradleFileEncrypt {
// files to encrypt
plainFiles.from('deployment/manager/fcm.json')
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..8bdaf60c7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f853b1c..2e1113280 100644
--- 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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b0..ef07e0162 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/model/build.gradle b/model/build.gradle
index 168f5b835..b6d03ef26 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -43,10 +43,11 @@ dependencies {
api "fr.neolegal:exp4j:$exp4jVersion"
dependencies {
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
- testImplementation 'org.mockito:mockito-core:5.18.0'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
+ testImplementation 'org.mockito:mockito-core:5.19.0'
testRuntimeOnly 'org.glassfish:jakarta.el:4.0.2'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
+ testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}
}
diff --git a/settings.gradle b/settings.gradle
index 2b8b8df7c..2cfa510bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,26 @@
+pluginManagement {
+ resolutionStrategy {
+ eachPlugin {
+ if (requested.id.toString() == "io.openremote.com.cherryperry.gradle-file-encrypt") {
+ useModule("com.github.openremote:GradleFileEncrypt:$requested.version")
+ }
+ }
+ }
+
+ repositories {
+ gradlePluginPortal()
+ maven {
+ url = "https://jitpack.io"
+ }
+ }
+}
plugins {
id 'cz.habarta.typescript-generator' version "$typescriptGeneratorVersion" apply false
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
- id 'com.cherryperry.gradle-file-encrypt' version '2.0.3' apply false
- id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.3' apply false
- id 'pl.allegro.tech.build.axion-release' version '1.18.16' apply false
+ id 'io.openremote.com.cherryperry.gradle-file-encrypt' version '2.1.0' apply false
+ id 'org.jetbrains.gradle.plugin.idea-ext' version '1.2' apply false
+ id 'pl.allegro.tech.build.axion-release' version '1.20.1' apply false
}
rootProject.name = "openremote"
diff --git a/test/build.gradle b/test/build.gradle
index ea1c1f918..caa5479d5 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'com.adarshr.test-logger' version '3.1.0'
+ id 'com.adarshr.test-logger' version '4.0.0'
}
apply plugin: "java-library"