Upgrade Gradle 8.4 to Gradle 8.7 (#148)

TWiStErRob · Apr 6, 2024 · 404eeb7 · 404eeb7
1 parent 51c652d
commit 404eeb7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -5,7 +5,7 @@
 	],
 	"packageRules": [
 		{
-			"description": "https://github.com/TWiStErRob/net.twisterrob.travel/issues/13",
+			"description": "https://github.com/TWiStErRob/net.twisterrob.libraries/issues/23",
 			"matchPackageNames": [
 				"gradle"
 			],

diff --git a/.idea/.name b/.idea/.name
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,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/libs b/libs
diff --git a/settings.gradle b/settings.gradle
@@ -15,7 +15,7 @@ plugins {
 	id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
-rootProject.name = "net-twisterrob-blt"
+rootProject.name = "net-twisterrob-travel"
 
 include(":android:app:full")
 include(":android:app:range")
+5 −5		gradle/libs.versions.toml
+ −		gradle/plugins/gradle/wrapper/gradle-wrapper.jar
+1 −1		gradle/plugins/gradle/wrapper/gradle-wrapper.properties
+10 −10		gradle/plugins/gradlew.bat
+0 −7		gradle/plugins/src/main/kotlin/net/twisterrob/libraries/net.twisterrob.libraries.android.library.gradle.kts
+ −		gradle/wrapper/gradle-wrapper.jar
+1 −1		gradle/wrapper/gradle-wrapper.properties
+10 −10		gradlew.bat
+0 −2		twister-lib-android/orbit/src/test/kotlin/net/twisterrob/orbit/logging/DecorateLoggingIntegrationTest.kt
+135 −41		twister-lib-android/orbit/src/test/kotlin/net/twisterrob/orbit/logging/LoggingContainerDecoratorTest.kt