diff --git a/native/XPlatLauncher/resources/TestProject/build.gradle.kts b/native/XPlatLauncher/resources/TestProject/build.gradle.kts index d98b514628e0..73a0babc4f40 100644 --- a/native/XPlatLauncher/resources/TestProject/build.gradle.kts +++ b/native/XPlatLauncher/resources/TestProject/build.gradle.kts @@ -4,7 +4,6 @@ import java.nio.file.StandardCopyOption plugins { id("java") - id("me.filippov.gradle.jvm.wrapper") version "0.14.0" } group = "com.intellij.idea" diff --git a/native/XPlatLauncher/resources/TestProject/gradlew b/native/XPlatLauncher/resources/TestProject/gradlew index df396029f7a1..1aa94a426907 100755 --- a/native/XPlatLauncher/resources/TestProject/gradlew +++ b/native/XPlatLauncher/resources/TestProject/gradlew @@ -115,97 +115,6 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar -# GRADLE JVM WRAPPER START MARKER -BUILD_DIR="${HOME}/.local/share/gradle-jvm" -JVM_ARCH=$(uname -m) -JVM_TEMP_FILE=$BUILD_DIR/gradle-jvm-temp.tar.gz -if [ "$darwin" = "true" ]; then - case $JVM_ARCH in - x86_64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_macos-x64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_macos-x64_bin-1bcf03 - ;; - arm64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_macos-aarch64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_macos-aarch64_bin-297fa2 - ;; - *) - die "Unknown architecture $JVM_ARCH" - ;; - esac -elif [ "$cygwin" = "true" ] || [ "$msys" = "true" ]; then - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_windows-x64_bin.zip - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_windows-x64_bin-d6ede5 -else - JVM_ARCH=$(linux$(getconf LONG_BIT) uname -m) - case $JVM_ARCH in - x86_64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_linux-x64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_linux-x64_bin-9324ae - ;; - aarch64) - JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_linux-aarch64_bin.tar.gz - JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_linux-aarch64_bin-319da6 - ;; - *) - die "Unknown architecture $JVM_ARCH" - ;; - esac -fi - -set -e - -if [ -e "$JVM_TARGET_DIR/.flag" ] && [ -n "$(ls "$JVM_TARGET_DIR")" ] && [ "x$(cat "$JVM_TARGET_DIR/.flag")" = "x${JVM_URL}" ]; then - # Everything is up-to-date in $JVM_TARGET_DIR, do nothing - true -else - echo "Downloading $JVM_URL to $JVM_TEMP_FILE" - - rm -f "$JVM_TEMP_FILE" - mkdir -p "$BUILD_DIR" - if command -v curl >/dev/null 2>&1; then - if [ -t 1 ]; then CURL_PROGRESS="--progress-bar"; else CURL_PROGRESS="--silent --show-error"; fi - # shellcheck disable=SC2086 - curl $CURL_PROGRESS -L --output "${JVM_TEMP_FILE}" "$JVM_URL" 2>&1 - elif command -v wget >/dev/null 2>&1; then - if [ -t 1 ]; then WGET_PROGRESS=""; else WGET_PROGRESS="-nv"; fi - wget $WGET_PROGRESS -O "${JVM_TEMP_FILE}" "$JVM_URL" 2>&1 - else - die "ERROR: Please install wget or curl" - fi - - echo "Extracting $JVM_TEMP_FILE to $JVM_TARGET_DIR" - rm -rf "$JVM_TARGET_DIR" - mkdir -p "$JVM_TARGET_DIR" - - case "$JVM_URL" in - *".zip") unzip "$JVM_TEMP_FILE" -d "$JVM_TARGET_DIR" ;; - *) tar -x -f "$JVM_TEMP_FILE" -C "$JVM_TARGET_DIR" ;; - esac - - rm -f "$JVM_TEMP_FILE" - - echo "$JVM_URL" >"$JVM_TARGET_DIR/.flag" -fi - -JAVA_HOME= -for d in "$JVM_TARGET_DIR" "$JVM_TARGET_DIR"/* "$JVM_TARGET_DIR"/Contents/Home "$JVM_TARGET_DIR"/*/Contents/Home; do - if [ -e "$d/bin/java" ]; then - JAVA_HOME="$d" - fi -done - -if [ '!' -e "$JAVA_HOME/bin/java" ]; then - die "Unable to find bin/java under $JVM_TARGET_DIR" -fi - -# Make it available for child processes -export JAVA_HOME - -set +e - -# GRADLE JVM WRAPPER END MARKER - # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then diff --git a/native/XPlatLauncher/resources/TestProject/gradlew.bat b/native/XPlatLauncher/resources/TestProject/gradlew.bat index f80956a0615f..6689b85beecd 100644 --- a/native/XPlatLauncher/resources/TestProject/gradlew.bat +++ b/native/XPlatLauncher/resources/TestProject/gradlew.bat @@ -36,82 +36,6 @@ for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" -@rem GRADLE JVM WRAPPER START MARKER - -setlocal -set BUILD_DIR=%LOCALAPPDATA%\gradle-jvm -set JVM_TARGET_DIR=%BUILD_DIR%\jdk-17.0.3.1_windows-x64_bin-d6ede5\ - -set JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_windows-x64_bin.zip - -set IS_TAR_GZ=0 -set JVM_TEMP_FILE=gradle-jvm.zip - -if /I "%JVM_URL:~-7%"==".tar.gz" ( - set IS_TAR_GZ=1 - set JVM_TEMP_FILE=gradle-jvm.tar.gz -) - -set POWERSHELL=%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe - -if not exist "%JVM_TARGET_DIR%" MD "%JVM_TARGET_DIR%" - -if not exist "%JVM_TARGET_DIR%.flag" goto downloadAndExtractJvm - -set /p CURRENT_FLAG=<"%JVM_TARGET_DIR%.flag" -if "%CURRENT_FLAG%" == "%JVM_URL%" goto continueWithJvm - -:downloadAndExtractJvm - -PUSHD "%BUILD_DIR%" -if errorlevel 1 goto fail - -echo Downloading %JVM_URL% to %BUILD_DIR%\%JVM_TEMP_FILE% -if exist "%JVM_TEMP_FILE%" DEL /F "%JVM_TEMP_FILE%" -"%POWERSHELL%" -nologo -noprofile -Command "Set-StrictMode -Version 3.0; $ErrorActionPreference = \"Stop\"; (New-Object Net.WebClient).DownloadFile('%JVM_URL%', '%JVM_TEMP_FILE%')" -if errorlevel 1 goto fail - -POPD - -RMDIR /S /Q "%JVM_TARGET_DIR%" -if errorlevel 1 goto fail - -MKDIR "%JVM_TARGET_DIR%" -if errorlevel 1 goto fail - -PUSHD "%JVM_TARGET_DIR%" -if errorlevel 1 goto fail - -echo Extracting %BUILD_DIR%\%JVM_TEMP_FILE% to %JVM_TARGET_DIR% - -if "%IS_TAR_GZ%"=="1" ( - tar xf "..\\%JVM_TEMP_FILE%" -) else ( - "%POWERSHELL%" -nologo -noprofile -command "Set-StrictMode -Version 3.0; $ErrorActionPreference = \"Stop\"; Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('..\\%JVM_TEMP_FILE%', '.');" -) -if errorlevel 1 goto fail - -DEL /F "..\%JVM_TEMP_FILE%" -if errorlevel 1 goto fail - -POPD - -echo %JVM_URL%>"%JVM_TARGET_DIR%.flag" -if errorlevel 1 goto fail - -:continueWithJvm - -set JAVA_HOME= -for /d %%d in ("%JVM_TARGET_DIR%"*) do if exist "%%d\bin\java.exe" set JAVA_HOME=%%d -if not exist "%JAVA_HOME%\bin\java.exe" ( - echo Unable to find java.exe under %JVM_TARGET_DIR% - goto fail -) - -endlocal & set JAVA_HOME=%JAVA_HOME% - -@rem GRADLE JVM WRAPPER END MARKER - @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome