From d575440bb1ed4f043ee8e2fba89e47fc20ea0367 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <konsoletyper@gmail.com>
Date: Mon, 6 Mar 2023 16:26:50 +0100
Subject: [PATCH] Bump Gradle version

---
 .../DependencyRelocationExtensionImpl.java         |  9 ++++-----
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 gradlew                                            |  6 ++++++
 gradlew.bat                                        | 14 ++++++++------
 tools/gradle/build.gradle.kts                      |  3 +++
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/build-logic/src/main/java/org/teavm/buildutil/DependencyRelocationExtensionImpl.java b/build-logic/src/main/java/org/teavm/buildutil/DependencyRelocationExtensionImpl.java
index 73cd55c36..5a184d11b 100644
--- a/build-logic/src/main/java/org/teavm/buildutil/DependencyRelocationExtensionImpl.java
+++ b/build-logic/src/main/java/org/teavm/buildutil/DependencyRelocationExtensionImpl.java
@@ -157,11 +157,10 @@ class DependencyRelocationExtensionImpl implements DependencyRelocationExtension
         replaceDependencies(
                 project,
                 JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME,
-                Arrays.asList(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME,
-                        JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME),
-                Arrays.asList(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME,
-                        JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME,
-                        JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME),
+                Arrays.asList(JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME),
+                Arrays.asList(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME,
+                        JavaPlugin.TEST_COMPILE_ONLY_CONFIGURATION_NAME,
+                        JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME),
                 depsByLibrary
         );
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee..e1bef7e87 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c78733..a69d9cb6c 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..53a6b238d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/tools/gradle/build.gradle.kts b/tools/gradle/build.gradle.kts
index 7c4998f73..f941e039e 100644
--- a/tools/gradle/build.gradle.kts
+++ b/tools/gradle/build.gradle.kts
@@ -96,6 +96,9 @@ val createConfig by tasks.registering {
 }
 
 tasks.compileJava.configure { dependsOn(createConfig) }
+tasks.sourcesJar {
+    dependsOn(createConfig)
+}
 
 sourceSets.main.configure { java.srcDir(configPath) }