From 54b42dfa8c6d7f91b530b1384fbddbd27caccf3f Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Tue, 25 Apr 2023 02:55:32 +0000 Subject: [PATCH] (misc) misc updates Signed-off-by: androidacy-user --- app/build.gradle.kts | 4 +- build.gradle.kts | 11 +- gradle/wrapper/gradle-wrapper.jar | Bin 62628 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 5 +- gradlew.bat | 184 +++++++++++------------ 6 files changed, 106 insertions(+), 101 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c2fa633..41367aa 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -408,7 +408,9 @@ android { kotlin { - jvmToolchain(17) + jvmToolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } } java { diff --git a/build.gradle.kts b/build.gradle.kts index 13bf079..ddad1e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:8.1.0-beta01") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20") - classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.6.1") + classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:10.6.2") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -34,4 +34,11 @@ afterEvaluate { sourceCompatibility = JavaVersion.VERSION_17.toString() targetCompatibility = JavaVersion.VERSION_17.toString() } -} \ No newline at end of file +} +val service = project.extensions.getByType() +val customLauncher = service.launcherFor { + languageVersion.set(JavaLanguageVersion.of(17)) +}5 +project.tasks.withType().configureEach { + kotlinJavaToolchain.toolchain.use(customLauncher) +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8409aabbb8b86681929be915a53fa5b8f6567758..c1962a79e29d3e0ab67b14947c167a862655af9b 100644 GIT binary patch delta 10678 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 Gwf-L;dZ`2e diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 80187ac..8707e8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip networkTimeout=10000 -validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fcb6fca..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -130,13 +130,10 @@ location of your Java installation." fi else JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi fi # Increase the maximum file descriptors if we can. diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,92 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -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% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -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 Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -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. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -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. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -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! -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 - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +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% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +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 Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega