From 962b8a17ffdae30d37baa1d2c25052ee27bb596f Mon Sep 17 00:00:00 2001 From: Jerome Dochez Date: Wed, 25 Jan 2023 21:19:59 -0800 Subject: [PATCH 1/2] updated all recipes to 7.4.0 --- .../build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- .../compileClasspathTest/build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- BuildSrc/customizeAgpDsl/build.gradle.kts | 2 +- .../customizeAgpDsl/buildSrc/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- BuildSrc/getApksTest/build.gradle.kts | 2 +- .../getApksTest/buildSrc/build.gradle.kts | 2 +- .../manifestReplacementTest/build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- BuildSrc/manifestUpdaterTest/build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- BuildSrc/setVersionsFromTask/build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 4 +- BuildSrc/testAsmTransformApi/build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 4 +- BuildSrc/toyPluginAds2021/build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../buildSrc/build.gradle.kts | 2 +- Groovy/appendToProjectClasses/build.gradle | 2 +- Groovy/appendToProjectClasses/gradlew.bat | 104 ------------------ Groovy/disableAndroidTest/build.gradle | 2 +- Groovy/disableUnitTest/build.gradle | 2 +- Groovy/getAllClassesTest/build.gradle | 2 +- Groovy/getApksTest/build.gradle | 2 +- Groovy/manifestReplacementTest/build.gradle | 2 +- Groovy/manifestTransformerTest/build.gradle | 2 +- Groovy/modifyProjectClasses/build.gradle | 2 +- Groovy/modifyProjectClasses/gradlew.bat | 104 ------------------ Groovy/replaceProjectClasses/build.gradle | 2 +- Groovy/replaceProjectClasses/gradlew.bat | 104 ------------------ .../build.gradle | 2 +- .../workerEnabledTransformation/build.gradle | 2 +- .../build.gradle.kts | 2 +- Kotlin/addCustomAsset/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../addCustomResValueField/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../app/build.gradle.kts | 1 - .../addCustomSourceInDslType/build.gradle.kts | 2 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 2 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 2 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 2 +- Kotlin/addJavaSource/build.gradle.kts | 2 +- Kotlin/addJavaSourceFromTask/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- Kotlin/addMetadataFileTest/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../appendToProjectClasses/build.gradle.kts | 2 +- Kotlin/appendToProjectClasses/gradlew.bat | 104 ------------------ Kotlin/changeMinSdkVersion/build.gradle.kts | 2 +- Kotlin/configurationsTest/build.gradle.kts | 2 +- Kotlin/getAarTest/build.gradle.kts | 2 +- Kotlin/getAllClassesTest/build.gradle.kts | 2 +- Kotlin/getApksFromBundleTest/build.gradle.kts | 2 +- Kotlin/getApksFromBundleTest/gradlew.bat | 104 ------------------ Kotlin/getApksTest/build.gradle.kts | 2 +- Kotlin/getBundleTest/build.gradle.kts | 2 +- Kotlin/getMappingFile/build.gradle.kts | 2 +- Kotlin/getPublicTxt/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../lintOptionsCustomization/build.gradle.kts | 2 +- .../manifestReplacementTest/build.gradle.kts | 2 +- .../manifestTransformerTest/build.gradle.kts | 2 +- Kotlin/modifyProjectClasses/build.gradle.kts | 2 +- Kotlin/modifyProjectClasses/gradlew.bat | 104 ------------------ Kotlin/replaceProjectClasses/build.gradle.kts | 2 +- Kotlin/replaceProjectClasses/gradlew.bat | 104 ------------------ .../build.gradle.kts | 2 +- Kotlin/setSigningConfig/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- 84 files changed, 75 insertions(+), 807 deletions(-) delete mode 100644 Groovy/appendToProjectClasses/gradlew.bat delete mode 100644 Groovy/modifyProjectClasses/gradlew.bat delete mode 100644 Groovy/replaceProjectClasses/gradlew.bat delete mode 100644 Kotlin/appendToProjectClasses/gradlew.bat delete mode 100644 Kotlin/getApksFromBundleTest/gradlew.bat delete mode 100644 Kotlin/modifyProjectClasses/gradlew.bat delete mode 100644 Kotlin/replaceProjectClasses/gradlew.bat diff --git a/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts b/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts +++ b/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts b/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts +++ b/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/compileClasspathTest/build.gradle.kts b/BuildSrc/compileClasspathTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/compileClasspathTest/build.gradle.kts +++ b/BuildSrc/compileClasspathTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts b/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts +++ b/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDsl/build.gradle.kts b/BuildSrc/customizeAgpDsl/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/customizeAgpDsl/build.gradle.kts +++ b/BuildSrc/customizeAgpDsl/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts +++ b/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/getApksTest/build.gradle.kts b/BuildSrc/getApksTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/getApksTest/build.gradle.kts +++ b/BuildSrc/getApksTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/getApksTest/buildSrc/build.gradle.kts b/BuildSrc/getApksTest/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/getApksTest/buildSrc/build.gradle.kts +++ b/BuildSrc/getApksTest/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/manifestReplacementTest/build.gradle.kts b/BuildSrc/manifestReplacementTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/manifestReplacementTest/build.gradle.kts +++ b/BuildSrc/manifestReplacementTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts b/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts +++ b/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/manifestUpdaterTest/build.gradle.kts b/BuildSrc/manifestUpdaterTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/manifestUpdaterTest/build.gradle.kts +++ b/BuildSrc/manifestUpdaterTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts b/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts +++ b/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/setVersionsFromTask/build.gradle.kts b/BuildSrc/setVersionsFromTask/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/setVersionsFromTask/build.gradle.kts +++ b/BuildSrc/setVersionsFromTask/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts b/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts index 68eb073f..0503ff0b 100644 --- a/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts +++ b/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts @@ -14,10 +14,10 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } dependencies { - implementation("com.android.tools.build:gradle:7.4.0-alpha08") + implementation("com.android.tools.build:gradle:7.4.0") } \ No newline at end of file diff --git a/BuildSrc/testAsmTransformApi/build.gradle.kts b/BuildSrc/testAsmTransformApi/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/testAsmTransformApi/build.gradle.kts +++ b/BuildSrc/testAsmTransformApi/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts b/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts index 720a8c7b..ecf3475b 100644 --- a/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts +++ b/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts b/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts +++ b/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts b/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts index 68eb073f..0503ff0b 100644 --- a/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts +++ b/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts @@ -14,10 +14,10 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } dependencies { - implementation("com.android.tools.build:gradle:7.4.0-alpha08") + implementation("com.android.tools.build:gradle:7.4.0") } \ No newline at end of file diff --git a/BuildSrc/toyPluginAds2021/build.gradle.kts b/BuildSrc/toyPluginAds2021/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/toyPluginAds2021/build.gradle.kts +++ b/BuildSrc/toyPluginAds2021/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts b/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts +++ b/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/workerEnabledTransformation/build.gradle.kts b/BuildSrc/workerEnabledTransformation/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/BuildSrc/workerEnabledTransformation/build.gradle.kts +++ b/BuildSrc/workerEnabledTransformation/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts b/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts index d379f5f2..50585924 100644 --- a/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts +++ b/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0-alpha08") + implementation("com.android.tools.build:gradle-api:7.4.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/Groovy/appendToProjectClasses/build.gradle b/Groovy/appendToProjectClasses/build.gradle index 08e78321..a1200f2d 100644 --- a/Groovy/appendToProjectClasses/build.gradle +++ b/Groovy/appendToProjectClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Groovy/appendToProjectClasses/gradlew.bat b/Groovy/appendToProjectClasses/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/Groovy/appendToProjectClasses/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Groovy/disableAndroidTest/build.gradle b/Groovy/disableAndroidTest/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/disableAndroidTest/build.gradle +++ b/Groovy/disableAndroidTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Groovy/disableUnitTest/build.gradle b/Groovy/disableUnitTest/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/disableUnitTest/build.gradle +++ b/Groovy/disableUnitTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Groovy/getAllClassesTest/build.gradle b/Groovy/getAllClassesTest/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/getAllClassesTest/build.gradle +++ b/Groovy/getAllClassesTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Groovy/getApksTest/build.gradle b/Groovy/getApksTest/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/getApksTest/build.gradle +++ b/Groovy/getApksTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Groovy/manifestReplacementTest/build.gradle b/Groovy/manifestReplacementTest/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/manifestReplacementTest/build.gradle +++ b/Groovy/manifestReplacementTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Groovy/manifestTransformerTest/build.gradle b/Groovy/manifestTransformerTest/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/manifestTransformerTest/build.gradle +++ b/Groovy/manifestTransformerTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Groovy/modifyProjectClasses/build.gradle b/Groovy/modifyProjectClasses/build.gradle index 08e78321..a1200f2d 100644 --- a/Groovy/modifyProjectClasses/build.gradle +++ b/Groovy/modifyProjectClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Groovy/modifyProjectClasses/gradlew.bat b/Groovy/modifyProjectClasses/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/Groovy/modifyProjectClasses/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Groovy/replaceProjectClasses/build.gradle b/Groovy/replaceProjectClasses/build.gradle index 08e78321..a1200f2d 100644 --- a/Groovy/replaceProjectClasses/build.gradle +++ b/Groovy/replaceProjectClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Groovy/replaceProjectClasses/gradlew.bat b/Groovy/replaceProjectClasses/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/Groovy/replaceProjectClasses/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Groovy/setCustomApplicationIdFromTask/build.gradle b/Groovy/setCustomApplicationIdFromTask/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/setCustomApplicationIdFromTask/build.gradle +++ b/Groovy/setCustomApplicationIdFromTask/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Groovy/workerEnabledTransformation/build.gradle b/Groovy/workerEnabledTransformation/build.gradle index 8967fc83..8eb41f0e 100644 --- a/Groovy/workerEnabledTransformation/build.gradle +++ b/Groovy/workerEnabledTransformation/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") } } diff --git a/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts b/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts +++ b/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomAsset/build.gradle.kts b/Kotlin/addCustomAsset/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomAsset/build.gradle.kts +++ b/Kotlin/addCustomAsset/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomBuildConfigField/build.gradle.kts b/Kotlin/addCustomBuildConfigField/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomBuildConfigField/build.gradle.kts +++ b/Kotlin/addCustomBuildConfigField/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts b/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts +++ b/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomManifestPlaceholder/build.gradle.kts b/Kotlin/addCustomManifestPlaceholder/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomManifestPlaceholder/build.gradle.kts +++ b/Kotlin/addCustomManifestPlaceholder/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomResValueField/build.gradle.kts b/Kotlin/addCustomResValueField/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomResValueField/build.gradle.kts +++ b/Kotlin/addCustomResValueField/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomResValueFromTask/build.gradle.kts b/Kotlin/addCustomResValueFromTask/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomResValueFromTask/build.gradle.kts +++ b/Kotlin/addCustomResValueFromTask/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomSourceInDslType/app/build.gradle.kts b/Kotlin/addCustomSourceInDslType/app/build.gradle.kts index 98112e14..478b1c1a 100644 --- a/Kotlin/addCustomSourceInDslType/app/build.gradle.kts +++ b/Kotlin/addCustomSourceInDslType/app/build.gradle.kts @@ -9,7 +9,6 @@ android { minSdkVersion(21) targetSdkVersion(29) } - namespace="com.example.customsourceindsl" } androidComponents { diff --git a/Kotlin/addCustomSourceInDslType/build.gradle.kts b/Kotlin/addCustomSourceInDslType/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomSourceInDslType/build.gradle.kts +++ b/Kotlin/addCustomSourceInDslType/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts b/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts index aece99c9..b1616d9c 100644 --- a/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts +++ b/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts @@ -40,7 +40,6 @@ android { minSdkVersion(21) targetSdkVersion(29) } - namespace="com.example.addcustomsource" } androidComponents { diff --git a/Kotlin/addCustomSourceInVariantTest/build.gradle.kts b/Kotlin/addCustomSourceInVariantTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomSourceInVariantTest/build.gradle.kts +++ b/Kotlin/addCustomSourceInVariantTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts index 31c4cc31..34ff2291 100644 --- a/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts @@ -39,7 +39,6 @@ android { defaultConfig { minSdkVersion(21) } - namespace="com.example.customsourceindsl" } androidComponents { diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts b/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts index 4967ab15..d2c5b48d 100644 --- a/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts @@ -8,7 +8,6 @@ android { defaultConfig { minSdkVersion(21) } - namespace="com.example.addsourcetype" } diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts b/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addJavaSource/build.gradle.kts b/Kotlin/addJavaSource/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addJavaSource/build.gradle.kts +++ b/Kotlin/addJavaSource/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addJavaSourceFromTask/build.gradle.kts b/Kotlin/addJavaSourceFromTask/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addJavaSourceFromTask/build.gradle.kts +++ b/Kotlin/addJavaSourceFromTask/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts b/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts +++ b/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/addMetadataFileTest/build.gradle.kts b/Kotlin/addMetadataFileTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/addMetadataFileTest/build.gradle.kts +++ b/Kotlin/addMetadataFileTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts +++ b/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts +++ b/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/appendToProjectClasses/build.gradle.kts b/Kotlin/appendToProjectClasses/build.gradle.kts index c3ba612d..958f13cb 100644 --- a/Kotlin/appendToProjectClasses/build.gradle.kts +++ b/Kotlin/appendToProjectClasses/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) classpath("org.javassist:javassist:3.26.0-GA") } diff --git a/Kotlin/appendToProjectClasses/gradlew.bat b/Kotlin/appendToProjectClasses/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/Kotlin/appendToProjectClasses/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Kotlin/changeMinSdkVersion/build.gradle.kts b/Kotlin/changeMinSdkVersion/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/changeMinSdkVersion/build.gradle.kts +++ b/Kotlin/changeMinSdkVersion/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/configurationsTest/build.gradle.kts b/Kotlin/configurationsTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/configurationsTest/build.gradle.kts +++ b/Kotlin/configurationsTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/getAarTest/build.gradle.kts b/Kotlin/getAarTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/getAarTest/build.gradle.kts +++ b/Kotlin/getAarTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/getAllClassesTest/build.gradle.kts b/Kotlin/getAllClassesTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/getAllClassesTest/build.gradle.kts +++ b/Kotlin/getAllClassesTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/getApksFromBundleTest/build.gradle.kts b/Kotlin/getApksFromBundleTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/getApksFromBundleTest/build.gradle.kts +++ b/Kotlin/getApksFromBundleTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/getApksFromBundleTest/gradlew.bat b/Kotlin/getApksFromBundleTest/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/Kotlin/getApksFromBundleTest/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Kotlin/getApksTest/build.gradle.kts b/Kotlin/getApksTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/getApksTest/build.gradle.kts +++ b/Kotlin/getApksTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/getBundleTest/build.gradle.kts b/Kotlin/getBundleTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/getBundleTest/build.gradle.kts +++ b/Kotlin/getBundleTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/getMappingFile/build.gradle.kts b/Kotlin/getMappingFile/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/getMappingFile/build.gradle.kts +++ b/Kotlin/getMappingFile/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/getPublicTxt/build.gradle.kts b/Kotlin/getPublicTxt/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/getPublicTxt/build.gradle.kts +++ b/Kotlin/getPublicTxt/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/libraryManifestTransformerTest/build.gradle.kts b/Kotlin/libraryManifestTransformerTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/libraryManifestTransformerTest/build.gradle.kts +++ b/Kotlin/libraryManifestTransformerTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/lintOptionsCustomization/build.gradle.kts b/Kotlin/lintOptionsCustomization/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/lintOptionsCustomization/build.gradle.kts +++ b/Kotlin/lintOptionsCustomization/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/manifestReplacementTest/build.gradle.kts b/Kotlin/manifestReplacementTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/manifestReplacementTest/build.gradle.kts +++ b/Kotlin/manifestReplacementTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/manifestTransformerTest/build.gradle.kts b/Kotlin/manifestTransformerTest/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/manifestTransformerTest/build.gradle.kts +++ b/Kotlin/manifestTransformerTest/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/modifyProjectClasses/build.gradle.kts b/Kotlin/modifyProjectClasses/build.gradle.kts index c3ba612d..958f13cb 100644 --- a/Kotlin/modifyProjectClasses/build.gradle.kts +++ b/Kotlin/modifyProjectClasses/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) classpath("org.javassist:javassist:3.26.0-GA") } diff --git a/Kotlin/modifyProjectClasses/gradlew.bat b/Kotlin/modifyProjectClasses/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/Kotlin/modifyProjectClasses/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Kotlin/replaceProjectClasses/build.gradle.kts b/Kotlin/replaceProjectClasses/build.gradle.kts index c3ba612d..958f13cb 100644 --- a/Kotlin/replaceProjectClasses/build.gradle.kts +++ b/Kotlin/replaceProjectClasses/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) classpath("org.javassist:javassist:3.26.0-GA") } diff --git a/Kotlin/replaceProjectClasses/gradlew.bat b/Kotlin/replaceProjectClasses/gradlew.bat deleted file mode 100644 index a9f778a7..00000000 --- a/Kotlin/replaceProjectClasses/gradlew.bat +++ /dev/null @@ -1,104 +0,0 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts b/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts +++ b/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/setSigningConfig/build.gradle.kts b/Kotlin/setSigningConfig/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/setSigningConfig/build.gradle.kts +++ b/Kotlin/setSigningConfig/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } diff --git a/Kotlin/workerEnabledTransformation/build.gradle.kts b/Kotlin/workerEnabledTransformation/build.gradle.kts index fbfc5d6e..3f8cd82a 100644 --- a/Kotlin/workerEnabledTransformation/build.gradle.kts +++ b/Kotlin/workerEnabledTransformation/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0") classpath(kotlin("gradle-plugin", version = "1.7.0")) } From a35a5b42d79ba37e9b1e49a7d3be9386271acefb Mon Sep 17 00:00:00 2001 From: Jerome Dochez Date: Thu, 9 Feb 2023 15:51:06 -0800 Subject: [PATCH 2/2] updared recipes with AGP 8.0-beta02 --- .../addBuildTypeUsingDslFinalize/build.gradle.kts | 4 ++-- .../buildSrc/build.gradle.kts | 4 ++-- BuildSrc/compileClasspathTest/build.gradle.kts | 4 ++-- .../compileClasspathTest/buildSrc/build.gradle.kts | 4 ++-- BuildSrc/customizeAgpDsl/build.gradle.kts | 4 ++-- BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts | 4 ++-- BuildSrc/customizeAgpDslAndVariant/build.gradle.kts | 4 ++-- .../buildSrc/build.gradle.kts | 4 ++-- .../build.gradle.kts | 4 ++-- .../buildSrc/build.gradle.kts | 4 ++-- BuildSrc/getApksTest/build.gradle.kts | 4 ++-- BuildSrc/getApksTest/buildSrc/build.gradle.kts | 4 ++-- BuildSrc/manifestReplacementTest/build.gradle.kts | 4 ++-- .../buildSrc/build.gradle.kts | 4 ++-- BuildSrc/manifestUpdaterTest/build.gradle.kts | 4 ++-- .../manifestUpdaterTest/buildSrc/build.gradle.kts | 4 ++-- BuildSrc/setVersionsFromTask/build.gradle.kts | 4 ++-- .../setVersionsFromTask/buildSrc/build.gradle.kts | 6 +++--- BuildSrc/testAsmTransformApi/build.gradle.kts | 4 ++-- .../testAsmTransformApi/buildSrc/build.gradle.kts | 6 +++--- .../testVariantFilteringOnBuildType/build.gradle.kts | 4 ++-- .../buildSrc/build.gradle.kts | 6 +++--- BuildSrc/toyPluginAds2021/build.gradle.kts | 4 ++-- BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts | 4 ++-- .../workerEnabledTransformation/build.gradle.kts | 4 ++-- .../buildSrc/build.gradle.kts | 4 ++-- Groovy/appendToProjectClasses/build.gradle | 2 +- Groovy/disableAndroidTest/build.gradle | 2 +- Groovy/disableUnitTest/build.gradle | 2 +- Groovy/getAllClassesTest/build.gradle | 2 +- Groovy/getApksTest/build.gradle | 2 +- Groovy/manifestReplacementTest/build.gradle | 2 +- Groovy/manifestTransformerTest/build.gradle | 2 +- Groovy/modifyProjectClasses/build.gradle | 2 +- Groovy/modifyProjectClasses/readme.md | 2 +- Groovy/replaceProjectClasses/build.gradle | 2 +- Groovy/setCustomApplicationIdFromTask/build.gradle | 2 +- Groovy/workerEnabledTransformation/build.gradle | 2 +- Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts | 4 ++-- Kotlin/addCustomAsset/build.gradle.kts | 4 ++-- .../addCustomBuildConfigField/app/build.gradle.kts | 3 +++ Kotlin/addCustomBuildConfigField/build.gradle.kts | 4 ++-- .../app/build.gradle.kts | 3 +++ .../addCustomFieldWithValueFromTask/build.gradle.kts | 4 ++-- Kotlin/addCustomManifestPlaceholder/build.gradle.kts | 4 ++-- Kotlin/addCustomResValueField/build.gradle.kts | 4 ++-- Kotlin/addCustomResValueFromTask/build.gradle.kts | 4 ++-- Kotlin/addCustomSourceInDslType/app/build.gradle.kts | 1 + Kotlin/addCustomSourceInDslType/build.gradle.kts | 4 ++-- .../app/build.gradle.kts | 1 + Kotlin/addCustomSourceInVariantTest/build.gradle.kts | 4 ++-- .../app/build.gradle.kts | 1 + .../build.gradle.kts | 4 ++-- .../app/build.gradle.kts | 1 + .../build.gradle.kts | 4 ++-- Kotlin/addJavaSource/build.gradle.kts | 4 ++-- Kotlin/addJavaSourceFromTask/build.gradle.kts | 4 ++-- .../addManifestPlaceholderFromTask/build.gradle.kts | 4 ++-- Kotlin/addMetadataFileTest/build.gradle.kts | 4 ++-- .../build.gradle.kts | 4 ++-- .../build.gradle.kts | 4 ++-- Kotlin/appendToProjectClasses/build.gradle.kts | 4 ++-- Kotlin/appendToProjectClasses/readme.md | 2 +- Kotlin/changeMinSdkVersion/build.gradle.kts | 4 ++-- Kotlin/configurationsTest/build.gradle.kts | 4 ++-- Kotlin/getAarTest/build.gradle.kts | 4 ++-- Kotlin/getAllClassesTest/build.gradle.kts | 4 ++-- Kotlin/getApksFromBundleTest/build.gradle.kts | 4 ++-- Kotlin/getApksTest/build.gradle.kts | 4 ++-- Kotlin/getBundleTest/build.gradle.kts | 4 ++-- Kotlin/getMappingFile/build.gradle.kts | 4 ++-- Kotlin/getPublicTxt/build.gradle.kts | 4 ++-- .../libraryManifestTransformerTest/build.gradle.kts | 4 ++-- Kotlin/lintOptionsCustomization/build.gradle.kts | 4 ++-- Kotlin/manifestReplacementTest/build.gradle.kts | 4 ++-- Kotlin/manifestTransformerTest/build.gradle.kts | 4 ++-- Kotlin/modifyProjectClasses/build.gradle.kts | 4 ++-- Kotlin/modifyProjectClasses/readme.md | 2 +- Kotlin/replaceProjectClasses/build.gradle.kts | 4 ++-- .../setCustomApplicationIdFromTask/build.gradle.kts | 4 ++-- Kotlin/setSigningConfig/build.gradle.kts | 4 ++-- .../workerEnabledTransformation/app/build.gradle.kts | 12 ------------ Kotlin/workerEnabledTransformation/build.gradle.kts | 4 ++-- 83 files changed, 151 insertions(+), 153 deletions(-) diff --git a/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts b/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts +++ b/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts b/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts +++ b/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/compileClasspathTest/build.gradle.kts b/BuildSrc/compileClasspathTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/compileClasspathTest/build.gradle.kts +++ b/BuildSrc/compileClasspathTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts b/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts +++ b/BuildSrc/compileClasspathTest/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDsl/build.gradle.kts b/BuildSrc/customizeAgpDsl/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/customizeAgpDsl/build.gradle.kts +++ b/BuildSrc/customizeAgpDsl/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts +++ b/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/getApksTest/build.gradle.kts b/BuildSrc/getApksTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/getApksTest/build.gradle.kts +++ b/BuildSrc/getApksTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/getApksTest/buildSrc/build.gradle.kts b/BuildSrc/getApksTest/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/getApksTest/buildSrc/build.gradle.kts +++ b/BuildSrc/getApksTest/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/manifestReplacementTest/build.gradle.kts b/BuildSrc/manifestReplacementTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/manifestReplacementTest/build.gradle.kts +++ b/BuildSrc/manifestReplacementTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts b/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts +++ b/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/manifestUpdaterTest/build.gradle.kts b/BuildSrc/manifestUpdaterTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/manifestUpdaterTest/build.gradle.kts +++ b/BuildSrc/manifestUpdaterTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts b/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts +++ b/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/setVersionsFromTask/build.gradle.kts b/BuildSrc/setVersionsFromTask/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/setVersionsFromTask/build.gradle.kts +++ b/BuildSrc/setVersionsFromTask/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts b/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts index 0503ff0b..9273ffa4 100644 --- a/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts +++ b/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,10 +14,10 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } dependencies { - implementation("com.android.tools.build:gradle:7.4.0") + implementation("com.android.tools.build:gradle:8.0.0-beta02") } \ No newline at end of file diff --git a/BuildSrc/testAsmTransformApi/build.gradle.kts b/BuildSrc/testAsmTransformApi/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/testAsmTransformApi/build.gradle.kts +++ b/BuildSrc/testAsmTransformApi/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts b/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts index ecf3475b..5ae7d249 100644 --- a/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts +++ b/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,10 +14,10 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } dependencies { - implementation("org.ow2.asm:asm-util:7.0") + implementation("org.ow2.asm:asm-util:9.2") } \ No newline at end of file diff --git a/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts b/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts +++ b/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts b/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts index 0503ff0b..9273ffa4 100644 --- a/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts +++ b/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,10 +14,10 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } dependencies { - implementation("com.android.tools.build:gradle:7.4.0") + implementation("com.android.tools.build:gradle:8.0.0-beta02") } \ No newline at end of file diff --git a/BuildSrc/toyPluginAds2021/build.gradle.kts b/BuildSrc/toyPluginAds2021/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/toyPluginAds2021/build.gradle.kts +++ b/BuildSrc/toyPluginAds2021/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts b/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts +++ b/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/workerEnabledTransformation/build.gradle.kts b/BuildSrc/workerEnabledTransformation/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/BuildSrc/workerEnabledTransformation/build.gradle.kts +++ b/BuildSrc/workerEnabledTransformation/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts b/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts index 50585924..7aa6ba27 100644 --- a/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts +++ b/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.7.0" + kotlin("jvm") version "1.7.20-Beta" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.4.0") + implementation("com.android.tools.build:gradle-api:8.0.0-beta02") implementation(kotlin("stdlib")) gradleApi() } diff --git a/Groovy/appendToProjectClasses/build.gradle b/Groovy/appendToProjectClasses/build.gradle index a1200f2d..95994b23 100644 --- a/Groovy/appendToProjectClasses/build.gradle +++ b/Groovy/appendToProjectClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Groovy/disableAndroidTest/build.gradle b/Groovy/disableAndroidTest/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/disableAndroidTest/build.gradle +++ b/Groovy/disableAndroidTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Groovy/disableUnitTest/build.gradle b/Groovy/disableUnitTest/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/disableUnitTest/build.gradle +++ b/Groovy/disableUnitTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Groovy/getAllClassesTest/build.gradle b/Groovy/getAllClassesTest/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/getAllClassesTest/build.gradle +++ b/Groovy/getAllClassesTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Groovy/getApksTest/build.gradle b/Groovy/getApksTest/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/getApksTest/build.gradle +++ b/Groovy/getApksTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Groovy/manifestReplacementTest/build.gradle b/Groovy/manifestReplacementTest/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/manifestReplacementTest/build.gradle +++ b/Groovy/manifestReplacementTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Groovy/manifestTransformerTest/build.gradle b/Groovy/manifestTransformerTest/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/manifestTransformerTest/build.gradle +++ b/Groovy/manifestTransformerTest/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Groovy/modifyProjectClasses/build.gradle b/Groovy/modifyProjectClasses/build.gradle index a1200f2d..95994b23 100644 --- a/Groovy/modifyProjectClasses/build.gradle +++ b/Groovy/modifyProjectClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Groovy/modifyProjectClasses/readme.md b/Groovy/modifyProjectClasses/readme.md index c74b5d30..8075d8ee 100644 --- a/Groovy/modifyProjectClasses/readme.md +++ b/Groovy/modifyProjectClasses/readme.md @@ -20,7 +20,7 @@ The [onVariants] block will wire the [ModifyClassesTask] input properties [allJa { it.getAllDirectories() }, { it.getOutput() }) ` -to transform [MultipleArtifact.ALL_CLASSES_DIRS] +to transform [ScopedArtifact.CLASSES] ## To Run ./gradlew :app:assembleDebug diff --git a/Groovy/replaceProjectClasses/build.gradle b/Groovy/replaceProjectClasses/build.gradle index a1200f2d..95994b23 100644 --- a/Groovy/replaceProjectClasses/build.gradle +++ b/Groovy/replaceProjectClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Groovy/setCustomApplicationIdFromTask/build.gradle b/Groovy/setCustomApplicationIdFromTask/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/setCustomApplicationIdFromTask/build.gradle +++ b/Groovy/setCustomApplicationIdFromTask/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Groovy/workerEnabledTransformation/build.gradle b/Groovy/workerEnabledTransformation/build.gradle index 8eb41f0e..2a6a3e86 100644 --- a/Groovy/workerEnabledTransformation/build.gradle +++ b/Groovy/workerEnabledTransformation/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") + classpath("com.android.tools.build:gradle:8.0.0-beta02") } } diff --git a/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts b/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts +++ b/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomAsset/build.gradle.kts b/Kotlin/addCustomAsset/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomAsset/build.gradle.kts +++ b/Kotlin/addCustomAsset/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomBuildConfigField/app/build.gradle.kts b/Kotlin/addCustomBuildConfigField/app/build.gradle.kts index a4cf41e1..934526b6 100644 --- a/Kotlin/addCustomBuildConfigField/app/build.gradle.kts +++ b/Kotlin/addCustomBuildConfigField/app/build.gradle.kts @@ -10,6 +10,9 @@ android { defaultConfig { minSdkVersion(21) } + buildFeatures { + buildConfig = true + } } androidComponents { diff --git a/Kotlin/addCustomBuildConfigField/build.gradle.kts b/Kotlin/addCustomBuildConfigField/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomBuildConfigField/build.gradle.kts +++ b/Kotlin/addCustomBuildConfigField/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts b/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts index 980fc7eb..48003fc0 100644 --- a/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts +++ b/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts @@ -48,6 +48,9 @@ android { defaultConfig { minSdkVersion(21) } + buildFeatures { + buildConfig = true + } } androidComponents { onVariants { diff --git a/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts b/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts +++ b/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomManifestPlaceholder/build.gradle.kts b/Kotlin/addCustomManifestPlaceholder/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomManifestPlaceholder/build.gradle.kts +++ b/Kotlin/addCustomManifestPlaceholder/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomResValueField/build.gradle.kts b/Kotlin/addCustomResValueField/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomResValueField/build.gradle.kts +++ b/Kotlin/addCustomResValueField/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomResValueFromTask/build.gradle.kts b/Kotlin/addCustomResValueFromTask/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomResValueFromTask/build.gradle.kts +++ b/Kotlin/addCustomResValueFromTask/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomSourceInDslType/app/build.gradle.kts b/Kotlin/addCustomSourceInDslType/app/build.gradle.kts index 478b1c1a..32cec973 100644 --- a/Kotlin/addCustomSourceInDslType/app/build.gradle.kts +++ b/Kotlin/addCustomSourceInDslType/app/build.gradle.kts @@ -4,6 +4,7 @@ plugins { } android { + namespace = "com.example.customSource" compileSdkVersion(29) defaultConfig { minSdkVersion(21) diff --git a/Kotlin/addCustomSourceInDslType/build.gradle.kts b/Kotlin/addCustomSourceInDslType/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomSourceInDslType/build.gradle.kts +++ b/Kotlin/addCustomSourceInDslType/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts b/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts index b1616d9c..f464348e 100644 --- a/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts +++ b/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts @@ -35,6 +35,7 @@ abstract class DisplayAllSources: DefaultTask() { } android { + namespace = "com.example.customSource" compileSdkVersion(29) defaultConfig { minSdkVersion(21) diff --git a/Kotlin/addCustomSourceInVariantTest/build.gradle.kts b/Kotlin/addCustomSourceInVariantTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomSourceInVariantTest/build.gradle.kts +++ b/Kotlin/addCustomSourceInVariantTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts index 34ff2291..822e2167 100644 --- a/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts @@ -35,6 +35,7 @@ abstract class DisplayAllSources: DefaultTask() { } android { + namespace = "com.example.customSource" compileSdkVersion(29) defaultConfig { minSdkVersion(21) diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts b/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts index d2c5b48d..00619e3f 100644 --- a/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts @@ -4,6 +4,7 @@ plugins { } android { + namespace = "com.example.customSource" compileSdkVersion(29) defaultConfig { minSdkVersion(21) diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts b/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addJavaSource/build.gradle.kts b/Kotlin/addJavaSource/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addJavaSource/build.gradle.kts +++ b/Kotlin/addJavaSource/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addJavaSourceFromTask/build.gradle.kts b/Kotlin/addJavaSourceFromTask/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addJavaSourceFromTask/build.gradle.kts +++ b/Kotlin/addJavaSourceFromTask/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts b/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts +++ b/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/addMetadataFileTest/build.gradle.kts b/Kotlin/addMetadataFileTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/addMetadataFileTest/build.gradle.kts +++ b/Kotlin/addMetadataFileTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts +++ b/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts +++ b/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/appendToProjectClasses/build.gradle.kts b/Kotlin/appendToProjectClasses/build.gradle.kts index 958f13cb..388b589e 100644 --- a/Kotlin/appendToProjectClasses/build.gradle.kts +++ b/Kotlin/appendToProjectClasses/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Kotlin/appendToProjectClasses/readme.md b/Kotlin/appendToProjectClasses/readme.md index 5e9b92a0..0e076298 100644 --- a/Kotlin/appendToProjectClasses/readme.md +++ b/Kotlin/appendToProjectClasses/readme.md @@ -8,7 +8,7 @@ In this example, we only add classes the [ListProperty] of [Directory]. The [onVariants] block will wire the [AddClassesTask] [output] folder using `wiredWith(AddClassesTask::output)` -to add classes to [MultipleArtifact.ALL_CLASSES_DIRS] +to add classes to [ScopedArtifact.CLASSES] ## To Run ./gradlew :app:assembleDebug diff --git a/Kotlin/changeMinSdkVersion/build.gradle.kts b/Kotlin/changeMinSdkVersion/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/changeMinSdkVersion/build.gradle.kts +++ b/Kotlin/changeMinSdkVersion/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/configurationsTest/build.gradle.kts b/Kotlin/configurationsTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/configurationsTest/build.gradle.kts +++ b/Kotlin/configurationsTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/getAarTest/build.gradle.kts b/Kotlin/getAarTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/getAarTest/build.gradle.kts +++ b/Kotlin/getAarTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/getAllClassesTest/build.gradle.kts b/Kotlin/getAllClassesTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/getAllClassesTest/build.gradle.kts +++ b/Kotlin/getAllClassesTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/getApksFromBundleTest/build.gradle.kts b/Kotlin/getApksFromBundleTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/getApksFromBundleTest/build.gradle.kts +++ b/Kotlin/getApksFromBundleTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/getApksTest/build.gradle.kts b/Kotlin/getApksTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/getApksTest/build.gradle.kts +++ b/Kotlin/getApksTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/getBundleTest/build.gradle.kts b/Kotlin/getBundleTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/getBundleTest/build.gradle.kts +++ b/Kotlin/getBundleTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/getMappingFile/build.gradle.kts b/Kotlin/getMappingFile/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/getMappingFile/build.gradle.kts +++ b/Kotlin/getMappingFile/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/getPublicTxt/build.gradle.kts b/Kotlin/getPublicTxt/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/getPublicTxt/build.gradle.kts +++ b/Kotlin/getPublicTxt/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/libraryManifestTransformerTest/build.gradle.kts b/Kotlin/libraryManifestTransformerTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/libraryManifestTransformerTest/build.gradle.kts +++ b/Kotlin/libraryManifestTransformerTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/lintOptionsCustomization/build.gradle.kts b/Kotlin/lintOptionsCustomization/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/lintOptionsCustomization/build.gradle.kts +++ b/Kotlin/lintOptionsCustomization/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/manifestReplacementTest/build.gradle.kts b/Kotlin/manifestReplacementTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/manifestReplacementTest/build.gradle.kts +++ b/Kotlin/manifestReplacementTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/manifestTransformerTest/build.gradle.kts b/Kotlin/manifestTransformerTest/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/manifestTransformerTest/build.gradle.kts +++ b/Kotlin/manifestTransformerTest/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/modifyProjectClasses/build.gradle.kts b/Kotlin/modifyProjectClasses/build.gradle.kts index 958f13cb..388b589e 100644 --- a/Kotlin/modifyProjectClasses/build.gradle.kts +++ b/Kotlin/modifyProjectClasses/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Kotlin/modifyProjectClasses/readme.md b/Kotlin/modifyProjectClasses/readme.md index 2e3e9951..7d159888 100644 --- a/Kotlin/modifyProjectClasses/readme.md +++ b/Kotlin/modifyProjectClasses/readme.md @@ -14,7 +14,7 @@ is using javassist to show how this can be done using a different bytecode enhan The [onVariants] block will wire the [ModifyClassesTask] input properties (allClasses] to the [output] folder `wiredWith(ModifyClassesTask::allClasses, ModifyClassesTask::output)` -to transform [MultipleArtifact.ALL_CLASSES_DIRS] +to transform [ScopedArtifact.CLASSES] ## To Run ./gradlew :app:assembleDebug diff --git a/Kotlin/replaceProjectClasses/build.gradle.kts b/Kotlin/replaceProjectClasses/build.gradle.kts index 958f13cb..388b589e 100644 --- a/Kotlin/replaceProjectClasses/build.gradle.kts +++ b/Kotlin/replaceProjectClasses/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) classpath("org.javassist:javassist:3.26.0-GA") } } diff --git a/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts b/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts +++ b/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/setSigningConfig/build.gradle.kts b/Kotlin/setSigningConfig/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/setSigningConfig/build.gradle.kts +++ b/Kotlin/setSigningConfig/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } } diff --git a/Kotlin/workerEnabledTransformation/app/build.gradle.kts b/Kotlin/workerEnabledTransformation/app/build.gradle.kts index 26ff1e8b..a23542ff 100644 --- a/Kotlin/workerEnabledTransformation/app/build.gradle.kts +++ b/Kotlin/workerEnabledTransformation/app/build.gradle.kts @@ -42,18 +42,6 @@ abstract class CopyApksTask @Inject constructor(private val workers: WorkerExecu @TaskAction fun taskAction() { - transformationRequest.get().submit( - this, - workers.noIsolation(), - WorkItem::class.java) { - builtArtifact: BuiltArtifact, - outputLocation: Directory, - param: WorkItemParameters -> - val inputFile = File(builtArtifact.outputFile) - param.inputApkFile.set(inputFile) - param.outputApkFile.set(File(outputLocation.asFile, inputFile.name)) - param.outputApkFile.get().asFile - } } } diff --git a/Kotlin/workerEnabledTransformation/build.gradle.kts b/Kotlin/workerEnabledTransformation/build.gradle.kts index 3f8cd82a..e900550e 100644 --- a/Kotlin/workerEnabledTransformation/build.gradle.kts +++ b/Kotlin/workerEnabledTransformation/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.4.0") - classpath(kotlin("gradle-plugin", version = "1.7.0")) + classpath("com.android.tools.build:gradle:8.0.0-beta02") + classpath(kotlin("gradle-plugin", version = "1.7.20-Beta")) } }