From 91a58a4e55fb0c216ef5519236cb5949832708e7 Mon Sep 17 00:00:00 2001 From: Jerome Dochez Date: Thu, 19 May 2022 02:56:52 +0000 Subject: [PATCH] updated all recipes to 7.2.0 final added some new recipes and updated all others. --- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- BuildSrc/customizeAgpDsl/app/build.gradle.kts | 1 - BuildSrc/customizeAgpDsl/build.gradle.kts | 4 +- .../customizeAgpDsl/buildSrc/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- BuildSrc/getApksTest/app/build.gradle.kts | 1 - BuildSrc/getApksTest/build.gradle.kts | 4 +- .../getApksTest/buildSrc/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../manifestReplacementTest/build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- .../manifestUpdaterTest/app/build.gradle.kts | 1 - BuildSrc/manifestUpdaterTest/build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- .../setVersionsFromTask/app/build.gradle.kts | 1 - BuildSrc/setVersionsFromTask/build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 6 +- .../testAsmTransformApi/app/build.gradle.kts | 1 - BuildSrc/testAsmTransformApi/build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- .../buildSrc/src/main/kotlin/ExamplePlugin.kt | 6 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 6 +- .../toyPluginAds2021/app/build.gradle.kts | 1 - BuildSrc/toyPluginAds2021/build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../buildSrc/build.gradle.kts | 4 +- Groovy/appendToAllClasses/app/build.gradle | 1 - Groovy/appendToAllClasses/build.gradle | 2 +- Groovy/disableAndroidTest/app/build.gradle | 1 - Groovy/disableAndroidTest/build.gradle | 2 +- Groovy/disableUnitTest/app/build.gradle | 1 - Groovy/disableUnitTest/build.gradle | 2 +- Groovy/getAllClassesTest/app/build.gradle | 1 - Groovy/getAllClassesTest/build.gradle | 2 +- Groovy/getApksTest/app/build.gradle | 1 - Groovy/getApksTest/build.gradle | 2 +- .../manifestReplacementTest/app/build.gradle | 1 - Groovy/manifestReplacementTest/build.gradle | 2 +- .../manifestTransformerTest/app/build.gradle | 1 - Groovy/manifestTransformerTest/build.gradle | 2 +- Groovy/modifyAllClasses/app/build.gradle | 1 - Groovy/modifyAllClasses/build.gradle | 2 +- .../app/build.gradle | 1 - .../build.gradle | 2 +- Groovy/setCustomApplicationIdFromTask/gradlew | 185 ------------------ .../app/build.gradle | 1 - .../workerEnabledTransformation/build.gradle | 2 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- Kotlin/addCustomAsset/app/build.gradle.kts | 1 - Kotlin/addCustomAsset/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../addCustomResValueField/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../app/build.gradle.kts | 17 ++ .../app/src/main/AndroidManifest.xml | 12 ++ .../addCustomSourceInDslType/build.gradle.kts | 18 ++ Kotlin/addCustomSourceInDslType/readme.md | 10 + .../settings.gradle.kts | 4 + .../app/build.gradle.kts | 62 ++++++ .../app/src/main/AndroidManifest.xml | 12 ++ .../build.gradle.kts | 18 ++ Kotlin/addCustomSourceInVariantTest/readme.md | 16 ++ .../settings.gradle.kts | 4 + .../app/build.gradle.kts | 62 ++++++ .../app/src/main/AndroidManifest.xml | 12 ++ .../build.gradle.kts | 18 ++ .../readme.md | 15 ++ .../settings.gradle.kts | 4 + .../app/build.gradle.kts | 64 ++++++ .../app/src/main/AndroidManifest.xml | 12 ++ .../build.gradle.kts | 18 ++ .../readme.md | 16 ++ .../settings.gradle.kts | 4 + Kotlin/addJavaSource/app/build.gradle.kts | 43 ++++ .../custom/src/java/debug/com/foo/Bar.java | 7 + .../custom/src/java/release/com/foo/Bar.java | 7 + .../app/src/main/AndroidManifest.xml | 12 ++ Kotlin/addJavaSource/build.gradle.kts | 18 ++ Kotlin/addJavaSource/readme.md | 13 ++ Kotlin/addJavaSource/settings.gradle.kts | 4 + .../app/build.gradle.kts | 70 +++++++ .../app/src/main/AndroidManifest.xml | 12 ++ Kotlin/addJavaSourceFromTask/build.gradle.kts | 18 ++ Kotlin/addJavaSourceFromTask/readme.md | 14 ++ .../addJavaSourceFromTask/settings.gradle.kts | 4 + .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../addMetadataFileTest/app/build.gradle.kts | 68 +++++++ .../app/src/main/AndroidManifest.xml | 12 ++ Kotlin/addMetadataFileTest/build.gradle.kts | 18 ++ Kotlin/addMetadataFileTest/readme.md | 7 + .../addMetadataFileTest/settings.gradle.kts | 4 + Kotlin/addToAllClasses/app/build.gradle.kts | 1 - Kotlin/addToAllClasses/build.gradle.kts | 4 +- .../build.gradle.kts | 4 +- .../module/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../module/build.gradle.kts | 1 - .../changeMinSdkVersion/app/build.gradle.kts | 1 - Kotlin/changeMinSdkVersion/build.gradle.kts | 4 +- Kotlin/getAarTest/build.gradle.kts | 4 +- Kotlin/getAarTest/lib/build.gradle.kts | 1 - Kotlin/getAllClassesTest/app/build.gradle.kts | 1 - Kotlin/getAllClassesTest/build.gradle.kts | 4 +- Kotlin/getApksTest/app/build.gradle.kts | 1 - Kotlin/getApksTest/build.gradle.kts | 4 +- Kotlin/getBundleTest/app/build.gradle.kts | 1 - Kotlin/getBundleTest/build.gradle.kts | 4 +- Kotlin/getMappingFile/app/build.gradle.kts | 1 - Kotlin/getMappingFile/build.gradle.kts | 4 +- Kotlin/getPublicTxt/build.gradle.kts | 4 +- Kotlin/getPublicTxt/lib/build.gradle.kts | 1 - .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- .../module/build.gradle.kts | 1 - .../app/build.gradle.kts | 1 - .../lintOptionsCustomization/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../manifestReplacementTest/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../manifestTransformerTest/build.gradle.kts | 4 +- Kotlin/modifyAllClasses/app/build.gradle.kts | 1 - Kotlin/modifyAllClasses/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- Kotlin/setSigningConfig/app/build.gradle.kts | 1 - Kotlin/setSigningConfig/build.gradle.kts | 4 +- .../app/build.gradle.kts | 1 - .../build.gradle.kts | 4 +- 148 files changed, 844 insertions(+), 349 deletions(-) delete mode 100755 Groovy/setCustomApplicationIdFromTask/gradlew create mode 100644 Kotlin/addCustomSourceInDslType/app/build.gradle.kts create mode 100644 Kotlin/addCustomSourceInDslType/app/src/main/AndroidManifest.xml create mode 100644 Kotlin/addCustomSourceInDslType/build.gradle.kts create mode 100644 Kotlin/addCustomSourceInDslType/readme.md create mode 100644 Kotlin/addCustomSourceInDslType/settings.gradle.kts create mode 100644 Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts create mode 100644 Kotlin/addCustomSourceInVariantTest/app/src/main/AndroidManifest.xml create mode 100644 Kotlin/addCustomSourceInVariantTest/build.gradle.kts create mode 100644 Kotlin/addCustomSourceInVariantTest/readme.md create mode 100644 Kotlin/addCustomSourceInVariantTest/settings.gradle.kts create mode 100644 Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts create mode 100644 Kotlin/addCustomSourceTypeInDslAndVariantTest/app/src/main/AndroidManifest.xml create mode 100644 Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts create mode 100644 Kotlin/addCustomSourceTypeInDslAndVariantTest/readme.md create mode 100644 Kotlin/addCustomSourceTypeInDslAndVariantTest/settings.gradle.kts create mode 100644 Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts create mode 100644 Kotlin/addCustomSourceTypeRequiringMergeTest/app/src/main/AndroidManifest.xml create mode 100644 Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts create mode 100644 Kotlin/addCustomSourceTypeRequiringMergeTest/readme.md create mode 100644 Kotlin/addCustomSourceTypeRequiringMergeTest/settings.gradle.kts create mode 100644 Kotlin/addJavaSource/app/build.gradle.kts create mode 100644 Kotlin/addJavaSource/app/custom/src/java/debug/com/foo/Bar.java create mode 100644 Kotlin/addJavaSource/app/custom/src/java/release/com/foo/Bar.java create mode 100644 Kotlin/addJavaSource/app/src/main/AndroidManifest.xml create mode 100644 Kotlin/addJavaSource/build.gradle.kts create mode 100644 Kotlin/addJavaSource/readme.md create mode 100644 Kotlin/addJavaSource/settings.gradle.kts create mode 100644 Kotlin/addJavaSourceFromTask/app/build.gradle.kts create mode 100644 Kotlin/addJavaSourceFromTask/app/src/main/AndroidManifest.xml create mode 100644 Kotlin/addJavaSourceFromTask/build.gradle.kts create mode 100644 Kotlin/addJavaSourceFromTask/readme.md create mode 100644 Kotlin/addJavaSourceFromTask/settings.gradle.kts create mode 100644 Kotlin/addMetadataFileTest/app/build.gradle.kts create mode 100644 Kotlin/addMetadataFileTest/app/src/main/AndroidManifest.xml create mode 100644 Kotlin/addMetadataFileTest/build.gradle.kts create mode 100644 Kotlin/addMetadataFileTest/readme.md create mode 100644 Kotlin/addMetadataFileTest/settings.gradle.kts diff --git a/BuildSrc/addBuildTypeUsingDslFinalize/app/build.gradle.kts b/BuildSrc/addBuildTypeUsingDslFinalize/app/build.gradle.kts index 06888c61..c75873fd 100644 --- a/BuildSrc/addBuildTypeUsingDslFinalize/app/build.gradle.kts +++ b/BuildSrc/addBuildTypeUsingDslFinalize/app/build.gradle.kts @@ -8,7 +8,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts b/BuildSrc/addBuildTypeUsingDslFinalize/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts b/BuildSrc/addBuildTypeUsingDslFinalize/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDsl/app/build.gradle.kts b/BuildSrc/customizeAgpDsl/app/build.gradle.kts index ca2ce20c..26ffd317 100644 --- a/BuildSrc/customizeAgpDsl/app/build.gradle.kts +++ b/BuildSrc/customizeAgpDsl/app/build.gradle.kts @@ -8,7 +8,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } buildTypes { debug { diff --git a/BuildSrc/customizeAgpDsl/build.gradle.kts b/BuildSrc/customizeAgpDsl/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDsl/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDslAndVariant/app/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariant/app/build.gradle.kts index a7461a83..d21ee439 100644 --- a/BuildSrc/customizeAgpDslAndVariant/app/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariant/app/build.gradle.kts @@ -9,7 +9,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } buildTypes { debug { diff --git a/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariant/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariant/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/app/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/app/build.gradle.kts index a7461a83..d21ee439 100644 --- a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/app/build.gradle.kts +++ b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/app/build.gradle.kts @@ -9,7 +9,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } buildTypes { debug { diff --git a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts b/BuildSrc/customizeAgpDslAndVariantWithConvenientAPI/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/getApksTest/app/build.gradle.kts b/BuildSrc/getApksTest/app/build.gradle.kts index 06888c61..c75873fd 100644 --- a/BuildSrc/getApksTest/app/build.gradle.kts +++ b/BuildSrc/getApksTest/app/build.gradle.kts @@ -8,7 +8,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/getApksTest/build.gradle.kts b/BuildSrc/getApksTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/getApksTest/buildSrc/build.gradle.kts b/BuildSrc/getApksTest/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/manifestReplacementTest/app/build.gradle.kts b/BuildSrc/manifestReplacementTest/app/build.gradle.kts index 06888c61..c75873fd 100644 --- a/BuildSrc/manifestReplacementTest/app/build.gradle.kts +++ b/BuildSrc/manifestReplacementTest/app/build.gradle.kts @@ -8,7 +8,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/manifestReplacementTest/build.gradle.kts b/BuildSrc/manifestReplacementTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts b/BuildSrc/manifestReplacementTest/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/manifestUpdaterTest/app/build.gradle.kts b/BuildSrc/manifestUpdaterTest/app/build.gradle.kts index 06888c61..c75873fd 100644 --- a/BuildSrc/manifestUpdaterTest/app/build.gradle.kts +++ b/BuildSrc/manifestUpdaterTest/app/build.gradle.kts @@ -8,7 +8,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/manifestUpdaterTest/build.gradle.kts b/BuildSrc/manifestUpdaterTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts b/BuildSrc/manifestUpdaterTest/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/setVersionsFromTask/app/build.gradle.kts b/BuildSrc/setVersionsFromTask/app/build.gradle.kts index 15192458..c35d9bcc 100644 --- a/BuildSrc/setVersionsFromTask/app/build.gradle.kts +++ b/BuildSrc/setVersionsFromTask/app/build.gradle.kts @@ -9,6 +9,5 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/setVersionsFromTask/build.gradle.kts b/BuildSrc/setVersionsFromTask/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts b/BuildSrc/setVersionsFromTask/buildSrc/build.gradle.kts index 2e03022c..97c8a988 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,10 +14,10 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } dependencies { - implementation("com.android.tools.build:gradle:7.1.0-alpha13") + implementation("com.android.tools.build:gradle:7.2.0") } \ No newline at end of file diff --git a/BuildSrc/testAsmTransformApi/app/build.gradle.kts b/BuildSrc/testAsmTransformApi/app/build.gradle.kts index 06888c61..c75873fd 100644 --- a/BuildSrc/testAsmTransformApi/app/build.gradle.kts +++ b/BuildSrc/testAsmTransformApi/app/build.gradle.kts @@ -8,7 +8,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/testAsmTransformApi/build.gradle.kts b/BuildSrc/testAsmTransformApi/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts b/BuildSrc/testAsmTransformApi/buildSrc/build.gradle.kts index eeea93d3..4834c551 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/testAsmTransformApi/buildSrc/src/main/kotlin/ExamplePlugin.kt b/BuildSrc/testAsmTransformApi/buildSrc/src/main/kotlin/ExamplePlugin.kt index 84d1b679..20dc803a 100644 --- a/BuildSrc/testAsmTransformApi/buildSrc/src/main/kotlin/ExamplePlugin.kt +++ b/BuildSrc/testAsmTransformApi/buildSrc/src/main/kotlin/ExamplePlugin.kt @@ -36,11 +36,11 @@ abstract class ExamplePlugin : Plugin { val androidComponents = project.extensions.getByType(AndroidComponentsExtension::class.java) androidComponents.onVariants { variant -> - variant.transformClassesWith(ExampleClassVisitorFactory::class.java, - InstrumentationScope.ALL) { + variant.instrumentation.transformClassesWith(ExampleClassVisitorFactory::class.java, + InstrumentationScope.ALL) { it.writeToStdout.set(true) } - variant.setAsmFramesComputationMode(FramesComputationMode.COPY_FRAMES) + variant.instrumentation.setAsmFramesComputationMode(FramesComputationMode.COPY_FRAMES) } } diff --git a/BuildSrc/testVariantFilteringOnBuildType/app/build.gradle.kts b/BuildSrc/testVariantFilteringOnBuildType/app/build.gradle.kts index 7d96fa8c..183edd12 100644 --- a/BuildSrc/testVariantFilteringOnBuildType/app/build.gradle.kts +++ b/BuildSrc/testVariantFilteringOnBuildType/app/build.gradle.kts @@ -9,6 +9,5 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts b/BuildSrc/testVariantFilteringOnBuildType/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts b/BuildSrc/testVariantFilteringOnBuildType/buildSrc/build.gradle.kts index 2e03022c..97c8a988 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,10 +14,10 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } dependencies { - implementation("com.android.tools.build:gradle:7.1.0-alpha13") + implementation("com.android.tools.build:gradle:7.2.0") } \ No newline at end of file diff --git a/BuildSrc/toyPluginAds2021/app/build.gradle.kts b/BuildSrc/toyPluginAds2021/app/build.gradle.kts index 8460cec2..fac8f2f9 100644 --- a/BuildSrc/toyPluginAds2021/app/build.gradle.kts +++ b/BuildSrc/toyPluginAds2021/app/build.gradle.kts @@ -8,7 +8,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/BuildSrc/toyPluginAds2021/build.gradle.kts b/BuildSrc/toyPluginAds2021/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts b/BuildSrc/toyPluginAds2021/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/BuildSrc/workerEnabledTransformation/app/build.gradle.kts b/BuildSrc/workerEnabledTransformation/app/build.gradle.kts index 06888c61..c75873fd 100644 --- a/BuildSrc/workerEnabledTransformation/app/build.gradle.kts +++ b/BuildSrc/workerEnabledTransformation/app/build.gradle.kts @@ -8,7 +8,6 @@ apply() android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } \ No newline at end of file diff --git a/BuildSrc/workerEnabledTransformation/build.gradle.kts b/BuildSrc/workerEnabledTransformation/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts b/BuildSrc/workerEnabledTransformation/buildSrc/build.gradle.kts index 5d675681..825e6265 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.4.32" + kotlin("jvm") version "1.5.31" } repositories { @@ -14,7 +14,7 @@ tasks.withType().configureEach { } dependencies { - implementation("com.android.tools.build:gradle-api:7.1.0-alpha13") + implementation("com.android.tools.build:gradle-api:7.2.0") implementation(kotlin("stdlib")) gradleApi() } diff --git a/Groovy/appendToAllClasses/app/build.gradle b/Groovy/appendToAllClasses/app/build.gradle index 9c314abc..34b0917f 100644 --- a/Groovy/appendToAllClasses/app/build.gradle +++ b/Groovy/appendToAllClasses/app/build.gradle @@ -29,7 +29,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Groovy/appendToAllClasses/build.gradle b/Groovy/appendToAllClasses/build.gradle index 3a232517..c03aa8dd 100644 --- a/Groovy/appendToAllClasses/build.gradle +++ b/Groovy/appendToAllClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") classpath("org.javassist:javassist:3.22.0-GA") } } diff --git a/Groovy/disableAndroidTest/app/build.gradle b/Groovy/disableAndroidTest/app/build.gradle index 714236d2..e659c367 100644 --- a/Groovy/disableAndroidTest/app/build.gradle +++ b/Groovy/disableAndroidTest/app/build.gradle @@ -6,7 +6,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Groovy/disableAndroidTest/build.gradle b/Groovy/disableAndroidTest/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Groovy/disableUnitTest/app/build.gradle b/Groovy/disableUnitTest/app/build.gradle index 12dda603..d99a26d1 100644 --- a/Groovy/disableUnitTest/app/build.gradle +++ b/Groovy/disableUnitTest/app/build.gradle @@ -6,7 +6,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Groovy/disableUnitTest/build.gradle b/Groovy/disableUnitTest/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Groovy/getAllClassesTest/app/build.gradle b/Groovy/getAllClassesTest/app/build.gradle index 9e958d9d..1a8e720e 100644 --- a/Groovy/getAllClassesTest/app/build.gradle +++ b/Groovy/getAllClassesTest/app/build.gradle @@ -38,7 +38,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Groovy/getAllClassesTest/build.gradle b/Groovy/getAllClassesTest/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Groovy/getApksTest/app/build.gradle b/Groovy/getApksTest/app/build.gradle index 024a206c..7cf6c916 100644 --- a/Groovy/getApksTest/app/build.gradle +++ b/Groovy/getApksTest/app/build.gradle @@ -39,7 +39,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Groovy/getApksTest/build.gradle b/Groovy/getApksTest/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Groovy/manifestReplacementTest/app/build.gradle b/Groovy/manifestReplacementTest/app/build.gradle index acb13123..d3dd2fc1 100644 --- a/Groovy/manifestReplacementTest/app/build.gradle +++ b/Groovy/manifestReplacementTest/app/build.gradle @@ -67,7 +67,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Groovy/manifestReplacementTest/build.gradle b/Groovy/manifestReplacementTest/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Groovy/manifestTransformerTest/app/build.gradle b/Groovy/manifestTransformerTest/app/build.gradle index 5645d14f..016e4bb4 100644 --- a/Groovy/manifestTransformerTest/app/build.gradle +++ b/Groovy/manifestTransformerTest/app/build.gradle @@ -54,7 +54,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } TaskProvider gitVersionProvider = tasks.register('gitVersionProvider', GitVersionTask) { diff --git a/Groovy/manifestTransformerTest/build.gradle b/Groovy/manifestTransformerTest/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Groovy/modifyAllClasses/app/build.gradle b/Groovy/modifyAllClasses/app/build.gradle index 218e71c9..867c1ac3 100644 --- a/Groovy/modifyAllClasses/app/build.gradle +++ b/Groovy/modifyAllClasses/app/build.gradle @@ -54,7 +54,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Groovy/modifyAllClasses/build.gradle b/Groovy/modifyAllClasses/build.gradle index 3a232517..c03aa8dd 100644 --- a/Groovy/modifyAllClasses/build.gradle +++ b/Groovy/modifyAllClasses/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") classpath("org.javassist:javassist:3.22.0-GA") } } diff --git a/Groovy/setCustomApplicationIdFromTask/app/build.gradle b/Groovy/setCustomApplicationIdFromTask/app/build.gradle index 294fb9e2..f29c09b2 100644 --- a/Groovy/setCustomApplicationIdFromTask/app/build.gradle +++ b/Groovy/setCustomApplicationIdFromTask/app/build.gradle @@ -6,7 +6,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Groovy/setCustomApplicationIdFromTask/build.gradle b/Groovy/setCustomApplicationIdFromTask/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Groovy/setCustomApplicationIdFromTask/gradlew b/Groovy/setCustomApplicationIdFromTask/gradlew deleted file mode 100755 index fbd7c515..00000000 --- a/Groovy/setCustomApplicationIdFromTask/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/Groovy/workerEnabledTransformation/app/build.gradle b/Groovy/workerEnabledTransformation/app/build.gradle index a79523d4..941d5d0f 100644 --- a/Groovy/workerEnabledTransformation/app/build.gradle +++ b/Groovy/workerEnabledTransformation/app/build.gradle @@ -97,7 +97,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Groovy/workerEnabledTransformation/build.gradle b/Groovy/workerEnabledTransformation/build.gradle index adbe7585..5e4cbe9c 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.1.0-alpha13") + classpath("com.android.tools.build:gradle:7.2.0") } } diff --git a/Kotlin/addBuildTypeUsingDslFinalize/app/build.gradle.kts b/Kotlin/addBuildTypeUsingDslFinalize/app/build.gradle.kts index 3ef08b5b..5421233d 100644 --- a/Kotlin/addBuildTypeUsingDslFinalize/app/build.gradle.kts +++ b/Kotlin/addBuildTypeUsingDslFinalize/app/build.gradle.kts @@ -8,7 +8,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts b/Kotlin/addBuildTypeUsingDslFinalize/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addCustomAsset/app/build.gradle.kts b/Kotlin/addCustomAsset/app/build.gradle.kts index 1df29ad6..d2343c5d 100644 --- a/Kotlin/addCustomAsset/app/build.gradle.kts +++ b/Kotlin/addCustomAsset/app/build.gradle.kts @@ -10,7 +10,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/addCustomAsset/build.gradle.kts b/Kotlin/addCustomAsset/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addCustomBuildConfigField/app/build.gradle.kts b/Kotlin/addCustomBuildConfigField/app/build.gradle.kts index f9f40e62..698d07db 100644 --- a/Kotlin/addCustomBuildConfigField/app/build.gradle.kts +++ b/Kotlin/addCustomBuildConfigField/app/build.gradle.kts @@ -9,7 +9,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/addCustomBuildConfigField/build.gradle.kts b/Kotlin/addCustomBuildConfigField/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts b/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts index d3c3eb73..f4303b93 100644 --- a/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts +++ b/Kotlin/addCustomFieldWithValueFromTask/app/build.gradle.kts @@ -47,7 +47,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts b/Kotlin/addCustomFieldWithValueFromTask/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addCustomManifestPlaceholder/app/build.gradle.kts b/Kotlin/addCustomManifestPlaceholder/app/build.gradle.kts index 60617024..9c7247e3 100644 --- a/Kotlin/addCustomManifestPlaceholder/app/build.gradle.kts +++ b/Kotlin/addCustomManifestPlaceholder/app/build.gradle.kts @@ -24,7 +24,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/addCustomManifestPlaceholder/build.gradle.kts b/Kotlin/addCustomManifestPlaceholder/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addCustomResValueField/app/build.gradle.kts b/Kotlin/addCustomResValueField/app/build.gradle.kts index 974c9b4b..1bbc00d5 100644 --- a/Kotlin/addCustomResValueField/app/build.gradle.kts +++ b/Kotlin/addCustomResValueField/app/build.gradle.kts @@ -9,7 +9,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/addCustomResValueField/build.gradle.kts b/Kotlin/addCustomResValueField/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addCustomResValueFromTask/app/build.gradle.kts b/Kotlin/addCustomResValueFromTask/app/build.gradle.kts index 136b2462..fcfe3942 100644 --- a/Kotlin/addCustomResValueFromTask/app/build.gradle.kts +++ b/Kotlin/addCustomResValueFromTask/app/build.gradle.kts @@ -47,7 +47,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/addCustomResValueFromTask/build.gradle.kts b/Kotlin/addCustomResValueFromTask/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addCustomSourceInDslType/app/build.gradle.kts b/Kotlin/addCustomSourceInDslType/app/build.gradle.kts new file mode 100644 index 00000000..34fdcedc --- /dev/null +++ b/Kotlin/addCustomSourceInDslType/app/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("com.android.application") + kotlin("android") + kotlin("android.extensions") +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(21) + targetSdkVersion(29) + } +} + +androidComponents { + registerSourceType("toml") +} \ No newline at end of file diff --git a/Kotlin/addCustomSourceInDslType/app/src/main/AndroidManifest.xml b/Kotlin/addCustomSourceInDslType/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..3a3e0b51 --- /dev/null +++ b/Kotlin/addCustomSourceInDslType/app/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Kotlin/addCustomSourceInDslType/build.gradle.kts b/Kotlin/addCustomSourceInDslType/build.gradle.kts new file mode 100644 index 00000000..472da163 --- /dev/null +++ b/Kotlin/addCustomSourceInDslType/build.gradle.kts @@ -0,0 +1,18 @@ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) + + } +} +allprojects { + repositories { + google() + jcenter() + } +} diff --git a/Kotlin/addCustomSourceInDslType/readme.md b/Kotlin/addCustomSourceInDslType/readme.md new file mode 100644 index 00000000..fb831392 --- /dev/null +++ b/Kotlin/addCustomSourceInDslType/readme.md @@ -0,0 +1,10 @@ +# Add custom source folders in Kotlin +This sample show how to add a new custom source folders to all source sets. The source folder will +not be used by any AGP tasks (since we do no know about it), however, it can be used by plugins and +tasks participating into the Variant API callbacks. + +To register the custom sources, you just need to use +`androidComponents { registerSourceType("toml") } ` + +## To Run +./gradlew sourceSets \ No newline at end of file diff --git a/Kotlin/addCustomSourceInDslType/settings.gradle.kts b/Kotlin/addCustomSourceInDslType/settings.gradle.kts new file mode 100644 index 00000000..c96f37e6 --- /dev/null +++ b/Kotlin/addCustomSourceInDslType/settings.gradle.kts @@ -0,0 +1,4 @@ + +include(":app") + +rootProject.name = "addCustomSourceInDslType" diff --git a/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts b/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts new file mode 100644 index 00000000..bbed8367 --- /dev/null +++ b/Kotlin/addCustomSourceInVariantTest/app/build.gradle.kts @@ -0,0 +1,62 @@ +plugins { + id("com.android.application") + kotlin("android") + kotlin("android.extensions") +} + +abstract class AddCustomSources: DefaultTask() { + + @get:OutputDirectory + abstract val outputFolder: DirectoryProperty + + @TaskAction + fun taskAction() { + val outputFile = File(outputFolder.asFile.get(), "com/foo/bar.toml") + outputFile.parentFile.mkdirs() + outputFile.writeText(""" + [clients] + data = [ ["gamma", "delta"], [1, 2] ] + """) + } +} + +abstract class DisplayAllSources: DefaultTask() { + + @get:InputFiles + abstract val sourceFolders: ListProperty + + @TaskAction + fun taskAction() { + + sourceFolders.get().forEach { directory -> + println("--> Got a Directory $directory") + println("<-- done") + } + } +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(21) + targetSdkVersion(29) + } +} + +androidComponents { + onVariants { variant -> + val addSourceTaskProvider = project.tasks.register("${variant.name}AddCustomSources") { + outputFolder.set(File(project.layout.buildDirectory.asFile.get(), "toml/gen")) + } + + variant.sources.getByName("toml").also { + it.addSrcDir("src/${variant.name}/toml") + it.add(addSourceTaskProvider, AddCustomSources::outputFolder) + } + println(variant.sources.getByName("toml")) + + project.tasks.register("${variant.name}DisplayAllSources") { + sourceFolders.set(variant.sources.getByName("toml").all) + } + } +} \ No newline at end of file diff --git a/Kotlin/addCustomSourceInVariantTest/app/src/main/AndroidManifest.xml b/Kotlin/addCustomSourceInVariantTest/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..3a3e0b51 --- /dev/null +++ b/Kotlin/addCustomSourceInVariantTest/app/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Kotlin/addCustomSourceInVariantTest/build.gradle.kts b/Kotlin/addCustomSourceInVariantTest/build.gradle.kts new file mode 100644 index 00000000..472da163 --- /dev/null +++ b/Kotlin/addCustomSourceInVariantTest/build.gradle.kts @@ -0,0 +1,18 @@ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) + + } +} +allprojects { + repositories { + google() + jcenter() + } +} diff --git a/Kotlin/addCustomSourceInVariantTest/readme.md b/Kotlin/addCustomSourceInVariantTest/readme.md new file mode 100644 index 00000000..4712a08a --- /dev/null +++ b/Kotlin/addCustomSourceInVariantTest/readme.md @@ -0,0 +1,16 @@ +# Add custom source folders in Kotlin +This sample show how to add a new custom source folders to the Variant. Note the sources will not +be added to the DSL and therefore to the usual src/ locations. The source folder will +not be used by any AGP tasks (since we do not know about it), however, it can be used by plugins and +tasks participating into the Variant API callbacks. + +To access the custome sources, you just need to use +`sourceFolders.set(variant.sources.getByName("toml").getAll()` +which can be used as [Task] input directly. + +To add a folder which content will be a execution time by a [Task] execution, you need +to use the [SourceDirectories.add] method providing a [TaskProvider] and the pointer to the output folder +where source files will be generated and added to the compilation task. + +## To Run +./gradlew :app:debugDisplayAllSources \ No newline at end of file diff --git a/Kotlin/addCustomSourceInVariantTest/settings.gradle.kts b/Kotlin/addCustomSourceInVariantTest/settings.gradle.kts new file mode 100644 index 00000000..272459e1 --- /dev/null +++ b/Kotlin/addCustomSourceInVariantTest/settings.gradle.kts @@ -0,0 +1,4 @@ + +include(":app") + +rootProject.name = "addCustomSourceInVariantTest" diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts new file mode 100644 index 00000000..e18d8050 --- /dev/null +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/build.gradle.kts @@ -0,0 +1,62 @@ +plugins { + id("com.android.application") + kotlin("android") + kotlin("android.extensions") +} + +abstract class AddCustomSources: DefaultTask() { + + @get:OutputDirectory + abstract val outputFolder: DirectoryProperty + + @TaskAction + fun taskAction() { + val outputFile = File(outputFolder.asFile.get(), "com/foo/bar.toml") + outputFile.parentFile.mkdirs() + outputFile.writeText(""" + [clients] + data = [ ["gamma", "delta"], [1, 2] ] + """) + } +} + +abstract class DisplayAllSources: DefaultTask() { + + @get:InputFiles + abstract val sourceFolders: ListProperty + + @TaskAction + fun taskAction() { + + sourceFolders.get().forEach { directory -> + println("--> Got a Directory $directory") + println("<-- done") + } + } +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(21) + } +} + +androidComponents { + registerSourceType("toml") + onVariants { variant -> + val addSourceTaskProvider = project.tasks.register("${variant.name}AddCustomSources") { + outputFolder.set(File(project.layout.buildDirectory.asFile.get(), "toml/gen")) + } + + variant.sources.getByName("toml").also { + it.addSrcDir("third_party/${variant.name}/toml") + it.add(addSourceTaskProvider, AddCustomSources::outputFolder) + } + println(variant.sources.getByName("toml")) + + project.tasks.register("${variant.name}DisplayAllSources") { + sourceFolders.set(variant.sources.getByName("toml").all) + } + } +} \ No newline at end of file diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/src/main/AndroidManifest.xml b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..3a3e0b51 --- /dev/null +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/app/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts b/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts new file mode 100644 index 00000000..472da163 --- /dev/null +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/build.gradle.kts @@ -0,0 +1,18 @@ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) + + } +} +allprojects { + repositories { + google() + jcenter() + } +} diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/readme.md b/Kotlin/addCustomSourceTypeInDslAndVariantTest/readme.md new file mode 100644 index 00000000..32a72636 --- /dev/null +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/readme.md @@ -0,0 +1,15 @@ +# Add custom source folders in Kotlin +This sample show how to add a new custom source folders to the Variant. The source folder will +not be used by any AGP tasks, however, it can be used by plugins and tasks participating into the +Variant API callbacks. + +To access the custome sources, you just need to use +`sourceFolders.set(variant.sources.getByName("toml").all` +which can be used as [Task] input directly. + +To add a folder which content will be a execution time by a [Task] execution, you need +to use the [SourceDirectories.add] method providing a [TaskProvider] and the pointer to the output folder +where source files will be generated and added to the compilation task. + +## To Run +./gradlew :app:debugDisplayAllSources \ No newline at end of file diff --git a/Kotlin/addCustomSourceTypeInDslAndVariantTest/settings.gradle.kts b/Kotlin/addCustomSourceTypeInDslAndVariantTest/settings.gradle.kts new file mode 100644 index 00000000..9743a879 --- /dev/null +++ b/Kotlin/addCustomSourceTypeInDslAndVariantTest/settings.gradle.kts @@ -0,0 +1,4 @@ + +include(":app") + +rootProject.name = "addCustomSourceTypeInDslAndVariantTest" diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts new file mode 100644 index 00000000..c65aeec3 --- /dev/null +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/build.gradle.kts @@ -0,0 +1,64 @@ +plugins { + id("com.android.application") + kotlin("android") + kotlin("android.extensions") +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(21) + } +} + + +abstract class MergeTomlSources: DefaultTask() { + + @get:InputFiles + abstract val sourceFolders: ListProperty + + @get:OutputDirectory + abstract val mergedFolder: DirectoryProperty + + @TaskAction + fun taskAction() { + + sourceFolders.get().forEach { directory -> + println("--> Got a Directory $directory") + directory.asFile.walk().forEach { sourceFile -> + println("Source: " + sourceFile.absolutePath) + } + println("<-- done") + } + } +} + +abstract class ConsumeMergedToml: DefaultTask() { + + @get:InputDirectory + abstract val mergedFolder: DirectoryProperty + + @TaskAction + fun taskAction() { + + println("Merged folder is " + mergedFolder.get().asFile) + } +} + + +androidComponents { + registerSourceType("toml") + onVariants { variant -> + + val outFolder = project.layout.buildDirectory.dir("intermediates/${variant.name}/merged_toml") + val mergingTask = project.tasks.register("${variant.name}MergeTomlSources") { + sourceFolders.set(variant.sources.getByName("toml").all) + mergedFolder.set(outFolder) + } + + + val consumingTask = project.tasks.register("${variant.name}ConsumeMergedToml") { + mergedFolder.set(mergingTask.flatMap { it.mergedFolder }) + } + } +} \ No newline at end of file diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/app/src/main/AndroidManifest.xml b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..3a3e0b51 --- /dev/null +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/app/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts b/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts new file mode 100644 index 00000000..472da163 --- /dev/null +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/build.gradle.kts @@ -0,0 +1,18 @@ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) + + } +} +allprojects { + repositories { + google() + jcenter() + } +} diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/readme.md b/Kotlin/addCustomSourceTypeRequiringMergeTest/readme.md new file mode 100644 index 00000000..8fc65818 --- /dev/null +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/readme.md @@ -0,0 +1,16 @@ +# Add custom source folders in Kotlin +This sample show how to add a new custom source folders to all source sets. The source folder will +by any AGP tasks (since we do no know about it), however, it can be used by plugins and +tasks participating into the Variant API callbacks. + +In this example, it is assumed that a merging activity has to happen before the source folders can +be used to be added to an AGP artifact (like ASSETS for example). + +To register the custom sources, you just need to use +`androidComponents { registerSourceType("toml") } ` + +The merging activity is implemented by the :app:debugMergeTomlSources and the downstream task that + uses the merged folder is :app:debugConsumeMergedToml + +## To Run +./gradlew sourceSets \ No newline at end of file diff --git a/Kotlin/addCustomSourceTypeRequiringMergeTest/settings.gradle.kts b/Kotlin/addCustomSourceTypeRequiringMergeTest/settings.gradle.kts new file mode 100644 index 00000000..4306e8c8 --- /dev/null +++ b/Kotlin/addCustomSourceTypeRequiringMergeTest/settings.gradle.kts @@ -0,0 +1,4 @@ + +include(":app") + +rootProject.name = "addCustomSourceTypeRequiringMergeTest" diff --git a/Kotlin/addJavaSource/app/build.gradle.kts b/Kotlin/addJavaSource/app/build.gradle.kts new file mode 100644 index 00000000..77dcd26c --- /dev/null +++ b/Kotlin/addJavaSource/app/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + id("com.android.application") + kotlin("android") + kotlin("android.extensions") +} +import org.gradle.api.DefaultTask +import org.gradle.api.file.FileTree +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.TaskAction + + +abstract class DisplayAllSources: DefaultTask() { + + @get:InputFiles + abstract val sourceFolders: ListProperty + + @TaskAction + fun taskAction() { + + sourceFolders.get().forEach { directory -> + println(">>> Got a Directory $directory") + println("<<<") + } + } +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(21) + targetSdkVersion(29) + } +} + +androidComponents { + onVariants { variant -> + variant.sources.java.addSrcDir("custom/src/java/${variant.name}") + + project.tasks.register("${variant.name}DisplayAllSources") { + sourceFolders.set(variant.sources.java.all) + } + } +} \ No newline at end of file diff --git a/Kotlin/addJavaSource/app/custom/src/java/debug/com/foo/Bar.java b/Kotlin/addJavaSource/app/custom/src/java/debug/com/foo/Bar.java new file mode 100644 index 00000000..ee82106a --- /dev/null +++ b/Kotlin/addJavaSource/app/custom/src/java/debug/com/foo/Bar.java @@ -0,0 +1,7 @@ +package com.foo; + +public class Bar { + public String toString() { + return "a debug Bar instance"; + } +} \ No newline at end of file diff --git a/Kotlin/addJavaSource/app/custom/src/java/release/com/foo/Bar.java b/Kotlin/addJavaSource/app/custom/src/java/release/com/foo/Bar.java new file mode 100644 index 00000000..1b6e0b70 --- /dev/null +++ b/Kotlin/addJavaSource/app/custom/src/java/release/com/foo/Bar.java @@ -0,0 +1,7 @@ +package com.foo; + +public class Bar { + public String toString() { + return "a release Bar instance"; + } +} \ No newline at end of file diff --git a/Kotlin/addJavaSource/app/src/main/AndroidManifest.xml b/Kotlin/addJavaSource/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..3a3e0b51 --- /dev/null +++ b/Kotlin/addJavaSource/app/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Kotlin/addJavaSource/build.gradle.kts b/Kotlin/addJavaSource/build.gradle.kts new file mode 100644 index 00000000..472da163 --- /dev/null +++ b/Kotlin/addJavaSource/build.gradle.kts @@ -0,0 +1,18 @@ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) + + } +} +allprojects { + repositories { + google() + jcenter() + } +} diff --git a/Kotlin/addJavaSource/readme.md b/Kotlin/addJavaSource/readme.md new file mode 100644 index 00000000..9031be87 --- /dev/null +++ b/Kotlin/addJavaSource/readme.md @@ -0,0 +1,13 @@ +# artifacts.get in Kotlin +This sample show how to obtain the java sources and add a [Directory] to the list of java sources +that will be used for compilation. + +To access all java sources, you just need to use +`sourceFolders.set(variant.sources.java.all` +which can be used as [Task] input directly. + +To add a folder and its content to the list of folders used for compilation, you need +to use the [SourceDirectories.srcDir] family of methods + +## To Run +./gradlew :app:debugDisplayAllSources diff --git a/Kotlin/addJavaSource/settings.gradle.kts b/Kotlin/addJavaSource/settings.gradle.kts new file mode 100644 index 00000000..cae6841b --- /dev/null +++ b/Kotlin/addJavaSource/settings.gradle.kts @@ -0,0 +1,4 @@ + +include(":app") + +rootProject.name = "addJavaSource" diff --git a/Kotlin/addJavaSourceFromTask/app/build.gradle.kts b/Kotlin/addJavaSourceFromTask/app/build.gradle.kts new file mode 100644 index 00000000..add767ac --- /dev/null +++ b/Kotlin/addJavaSourceFromTask/app/build.gradle.kts @@ -0,0 +1,70 @@ +plugins { + id("com.android.application") + kotlin("android") + kotlin("android.extensions") +} +import org.gradle.api.DefaultTask +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.FileTree +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.TaskAction +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Internal + +abstract class AddJavaSources: DefaultTask() { + + @get:OutputDirectory + abstract val outputFolder: DirectoryProperty + + @TaskAction + fun taskAction() { + val outputFile = File(outputFolder.asFile.get(), "com/foo/Bar.java") + outputFile.parentFile.mkdirs() + outputFile.writeText(""" + package com.foo; + + public class Bar { + public String toString() { + return "a Bar instance"; + } + } + """) + } +} + +abstract class DisplayAllSources: DefaultTask() { + + @get:InputFiles + abstract val sourceFolders: ListProperty + + @TaskAction + fun taskAction() { + + sourceFolders.get().forEach { directory -> + println(">>> Got a Directory $directory") + println("<<<") + } + } +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(21) + targetSdkVersion(29) + } +} + +androidComponents { + onVariants { variant -> + val addSourceTaskProvider = project.tasks.register("${variant.name}AddSources") { + outputFolder.set(project.layout.buildDirectory.dir("gen")) + } + + variant.sources.java.add(addSourceTaskProvider, AddJavaSources::outputFolder) + + project.tasks.register("${variant.name}DisplayAllSources") { + sourceFolders.set(variant.sources.java.all) + } + } +} \ No newline at end of file diff --git a/Kotlin/addJavaSourceFromTask/app/src/main/AndroidManifest.xml b/Kotlin/addJavaSourceFromTask/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..3a3e0b51 --- /dev/null +++ b/Kotlin/addJavaSourceFromTask/app/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Kotlin/addJavaSourceFromTask/build.gradle.kts b/Kotlin/addJavaSourceFromTask/build.gradle.kts new file mode 100644 index 00000000..472da163 --- /dev/null +++ b/Kotlin/addJavaSourceFromTask/build.gradle.kts @@ -0,0 +1,18 @@ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) + + } +} +allprojects { + repositories { + google() + jcenter() + } +} diff --git a/Kotlin/addJavaSourceFromTask/readme.md b/Kotlin/addJavaSourceFromTask/readme.md new file mode 100644 index 00000000..63b56a34 --- /dev/null +++ b/Kotlin/addJavaSourceFromTask/readme.md @@ -0,0 +1,14 @@ +# Sources.java.getAll in Kotlin +This sample show how to obtain the java sources and add a [Directory] to the list of java sources +that will be used for compilation. + +To access all java sources, you just need to use +`sourceFolders.set(variant.sources.java.all` +which can be used as [Task] input directly. + +To add a folder which content will be a execution time by a [Task] execution, you need +to use the [SourceDirectories.add] method providing a [TaskProvider] and the pointer to the output folder +where source files will be generated and added to the compilation task. + +## To Run +./gradlew :app:debugDisplayAllSources diff --git a/Kotlin/addJavaSourceFromTask/settings.gradle.kts b/Kotlin/addJavaSourceFromTask/settings.gradle.kts new file mode 100644 index 00000000..29b936e5 --- /dev/null +++ b/Kotlin/addJavaSourceFromTask/settings.gradle.kts @@ -0,0 +1,4 @@ + +include(":app") + +rootProject.name = "addJavaSourceFromTask" diff --git a/Kotlin/addManifestPlaceholderFromTask/app/build.gradle.kts b/Kotlin/addManifestPlaceholderFromTask/app/build.gradle.kts index b0098a4a..d244a330 100644 --- a/Kotlin/addManifestPlaceholderFromTask/app/build.gradle.kts +++ b/Kotlin/addManifestPlaceholderFromTask/app/build.gradle.kts @@ -51,7 +51,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts b/Kotlin/addManifestPlaceholderFromTask/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/addMetadataFileTest/app/build.gradle.kts b/Kotlin/addMetadataFileTest/app/build.gradle.kts new file mode 100644 index 00000000..070846f7 --- /dev/null +++ b/Kotlin/addMetadataFileTest/app/build.gradle.kts @@ -0,0 +1,68 @@ +plugins { + id("com.android.application") + kotlin("android") +} +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.tasks.InputFile +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction +import com.android.build.api.variant.BuiltArtifactsLoader +import com.android.build.api.artifact.SingleArtifact +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Internal +import java.util.zip.ZipFile + +abstract class AddMetadataInBundleTask: DefaultTask() { + @get:OutputFile + abstract val metadataFile: RegularFileProperty + + @TaskAction + fun taskAction() { + metadataFile.get().asFile.writeText("some metadata") + } +} + +abstract class DisplayBundleTask: DefaultTask() { + + @get:InputFile + abstract val bundle: RegularFileProperty + + @TaskAction + fun taskAction() { + + ZipFile(bundle.get().asFile).use { + it.entries().asIterator().forEach { entry -> + println(entry.name) + } + } + } +} + +android { + compileSdkVersion(29) + defaultConfig { + minSdkVersion(21) + versionCode = 1 + } +} + +androidComponents { + onVariants { variant -> + val metadataTask = project.tasks.register("${variant.name}AddMetadata") { + File(getBuildDir(), name).also { + metadataFile.set(File(it, "metadata.pb")) + } + } + + variant.bundleConfig.addMetadataFile( + "com.android.build", + metadataTask.flatMap { it.metadataFile } + ) + + project.tasks.register("${variant.name}DisplayBundle") { + bundle.set(variant.artifacts.get(SingleArtifact.BUNDLE)) + } + } +} \ No newline at end of file diff --git a/Kotlin/addMetadataFileTest/app/src/main/AndroidManifest.xml b/Kotlin/addMetadataFileTest/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..3a3e0b51 --- /dev/null +++ b/Kotlin/addMetadataFileTest/app/src/main/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Kotlin/addMetadataFileTest/build.gradle.kts b/Kotlin/addMetadataFileTest/build.gradle.kts new file mode 100644 index 00000000..472da163 --- /dev/null +++ b/Kotlin/addMetadataFileTest/build.gradle.kts @@ -0,0 +1,18 @@ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) + + } +} +allprojects { + repositories { + google() + jcenter() + } +} diff --git a/Kotlin/addMetadataFileTest/readme.md b/Kotlin/addMetadataFileTest/readme.md new file mode 100644 index 00000000..f0e42bef --- /dev/null +++ b/Kotlin/addMetadataFileTest/readme.md @@ -0,0 +1,7 @@ +# bundleConfig.addMetadataFile in Kotlin +This sample show how to add a metadata file to the built bundle. +The [BundleConfig] variant object will be used to register the output of the AddMetadataInBundleTask +Task to a new metadata file to be added to the resulting bundle file. +## To Run +./gradlew debugDisplayBundle +expected result : You should see the added metadata.pb file added to the resulting bundle. \ No newline at end of file diff --git a/Kotlin/addMetadataFileTest/settings.gradle.kts b/Kotlin/addMetadataFileTest/settings.gradle.kts new file mode 100644 index 00000000..f6cfff17 --- /dev/null +++ b/Kotlin/addMetadataFileTest/settings.gradle.kts @@ -0,0 +1,4 @@ + +include(":app") + +rootProject.name = "addMetadataFileTest" diff --git a/Kotlin/addToAllClasses/app/build.gradle.kts b/Kotlin/addToAllClasses/app/build.gradle.kts index 5409ff4c..cdd7a7f9 100644 --- a/Kotlin/addToAllClasses/app/build.gradle.kts +++ b/Kotlin/addToAllClasses/app/build.gradle.kts @@ -34,7 +34,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/addToAllClasses/build.gradle.kts b/Kotlin/addToAllClasses/build.gradle.kts index 7cfb617c..9501d22f 100644 --- a/Kotlin/addToAllClasses/build.gradle.kts +++ b/Kotlin/addToAllClasses/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) classpath("org.javassist:javassist:3.22.0-GA") } } diff --git a/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_AAR]/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/androidArtifactTransformTest[artifact_AAR]/module/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_AAR]/module/build.gradle.kts index 455c0d44..6ce8e39a 100644 --- a/Kotlin/androidArtifactTransformTest[artifact_AAR]/module/build.gradle.kts +++ b/Kotlin/androidArtifactTransformTest[artifact_AAR]/module/build.gradle.kts @@ -40,7 +40,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/module/build.gradle.kts b/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/module/build.gradle.kts index 5d720f06..d228e090 100644 --- a/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/module/build.gradle.kts +++ b/Kotlin/androidArtifactTransformTest[artifact_BUNDLE]/module/build.gradle.kts @@ -40,7 +40,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } defaultConfig { diff --git a/Kotlin/changeMinSdkVersion/app/build.gradle.kts b/Kotlin/changeMinSdkVersion/app/build.gradle.kts index c1d9544e..624589d1 100644 --- a/Kotlin/changeMinSdkVersion/app/build.gradle.kts +++ b/Kotlin/changeMinSdkVersion/app/build.gradle.kts @@ -10,7 +10,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/changeMinSdkVersion/build.gradle.kts b/Kotlin/changeMinSdkVersion/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/getAarTest/build.gradle.kts b/Kotlin/getAarTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/getAarTest/lib/build.gradle.kts b/Kotlin/getAarTest/lib/build.gradle.kts index 35337768..f04a733f 100644 --- a/Kotlin/getAarTest/lib/build.gradle.kts +++ b/Kotlin/getAarTest/lib/build.gradle.kts @@ -27,7 +27,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/getAllClassesTest/app/build.gradle.kts b/Kotlin/getAllClassesTest/app/build.gradle.kts index c06e8663..01083a8c 100644 --- a/Kotlin/getAllClassesTest/app/build.gradle.kts +++ b/Kotlin/getAllClassesTest/app/build.gradle.kts @@ -38,7 +38,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/getAllClassesTest/build.gradle.kts b/Kotlin/getAllClassesTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/getApksTest/app/build.gradle.kts b/Kotlin/getApksTest/app/build.gradle.kts index a42bc646..65b3c0e5 100644 --- a/Kotlin/getApksTest/app/build.gradle.kts +++ b/Kotlin/getApksTest/app/build.gradle.kts @@ -35,7 +35,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/getApksTest/build.gradle.kts b/Kotlin/getApksTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/getBundleTest/app/build.gradle.kts b/Kotlin/getBundleTest/app/build.gradle.kts index 6a4066ff..a4664faf 100644 --- a/Kotlin/getBundleTest/app/build.gradle.kts +++ b/Kotlin/getBundleTest/app/build.gradle.kts @@ -25,7 +25,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } defaultConfig { versionCode = 3 diff --git a/Kotlin/getBundleTest/build.gradle.kts b/Kotlin/getBundleTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/getMappingFile/app/build.gradle.kts b/Kotlin/getMappingFile/app/build.gradle.kts index fb621e53..76d95cdb 100644 --- a/Kotlin/getMappingFile/app/build.gradle.kts +++ b/Kotlin/getMappingFile/app/build.gradle.kts @@ -27,7 +27,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } buildTypes { getByName("debug") { diff --git a/Kotlin/getMappingFile/build.gradle.kts b/Kotlin/getMappingFile/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/getPublicTxt/build.gradle.kts b/Kotlin/getPublicTxt/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/getPublicTxt/lib/build.gradle.kts b/Kotlin/getPublicTxt/lib/build.gradle.kts index 91211fac..103eb565 100644 --- a/Kotlin/getPublicTxt/lib/build.gradle.kts +++ b/Kotlin/getPublicTxt/lib/build.gradle.kts @@ -55,7 +55,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/libraryManifestTransformerTest/app/build.gradle.kts b/Kotlin/libraryManifestTransformerTest/app/build.gradle.kts index b49faa11..bda0f155 100644 --- a/Kotlin/libraryManifestTransformerTest/app/build.gradle.kts +++ b/Kotlin/libraryManifestTransformerTest/app/build.gradle.kts @@ -7,7 +7,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } dependencies { diff --git a/Kotlin/libraryManifestTransformerTest/build.gradle.kts b/Kotlin/libraryManifestTransformerTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/libraryManifestTransformerTest/module/build.gradle.kts b/Kotlin/libraryManifestTransformerTest/module/build.gradle.kts index 82f31b42..b848d70d 100644 --- a/Kotlin/libraryManifestTransformerTest/module/build.gradle.kts +++ b/Kotlin/libraryManifestTransformerTest/module/build.gradle.kts @@ -31,7 +31,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/lintOptionsCustomization/app/build.gradle.kts b/Kotlin/lintOptionsCustomization/app/build.gradle.kts index b49faa11..bda0f155 100644 --- a/Kotlin/lintOptionsCustomization/app/build.gradle.kts +++ b/Kotlin/lintOptionsCustomization/app/build.gradle.kts @@ -7,7 +7,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } dependencies { diff --git a/Kotlin/lintOptionsCustomization/build.gradle.kts b/Kotlin/lintOptionsCustomization/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/manifestReplacementTest/app/build.gradle.kts b/Kotlin/manifestReplacementTest/app/build.gradle.kts index 4d86d449..c9ee3f26 100644 --- a/Kotlin/manifestReplacementTest/app/build.gradle.kts +++ b/Kotlin/manifestReplacementTest/app/build.gradle.kts @@ -68,7 +68,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/manifestReplacementTest/build.gradle.kts b/Kotlin/manifestReplacementTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/manifestTransformerTest/app/build.gradle.kts b/Kotlin/manifestTransformerTest/app/build.gradle.kts index b3607898..dd88a293 100644 --- a/Kotlin/manifestTransformerTest/app/build.gradle.kts +++ b/Kotlin/manifestTransformerTest/app/build.gradle.kts @@ -54,7 +54,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/manifestTransformerTest/build.gradle.kts b/Kotlin/manifestTransformerTest/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/modifyAllClasses/app/build.gradle.kts b/Kotlin/modifyAllClasses/app/build.gradle.kts index ebfcebf2..6a74444b 100644 --- a/Kotlin/modifyAllClasses/app/build.gradle.kts +++ b/Kotlin/modifyAllClasses/app/build.gradle.kts @@ -53,7 +53,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/modifyAllClasses/build.gradle.kts b/Kotlin/modifyAllClasses/build.gradle.kts index 7cfb617c..9501d22f 100644 --- a/Kotlin/modifyAllClasses/build.gradle.kts +++ b/Kotlin/modifyAllClasses/build.gradle.kts @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:7.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) classpath("org.javassist:javassist:3.22.0-GA") } } diff --git a/Kotlin/setCustomApplicationIdFromTask/app/build.gradle.kts b/Kotlin/setCustomApplicationIdFromTask/app/build.gradle.kts index 3db3bdab..f9c884c3 100644 --- a/Kotlin/setCustomApplicationIdFromTask/app/build.gradle.kts +++ b/Kotlin/setCustomApplicationIdFromTask/app/build.gradle.kts @@ -6,7 +6,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } diff --git a/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts b/Kotlin/setCustomApplicationIdFromTask/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/setSigningConfig/app/build.gradle.kts b/Kotlin/setSigningConfig/app/build.gradle.kts index 13b93d2e..5f281da8 100644 --- a/Kotlin/setSigningConfig/app/build.gradle.kts +++ b/Kotlin/setSigningConfig/app/build.gradle.kts @@ -15,7 +15,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } signingConfigs { diff --git a/Kotlin/setSigningConfig/build.gradle.kts b/Kotlin/setSigningConfig/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } } diff --git a/Kotlin/workerEnabledTransformation/app/build.gradle.kts b/Kotlin/workerEnabledTransformation/app/build.gradle.kts index d6824eec..747b6532 100644 --- a/Kotlin/workerEnabledTransformation/app/build.gradle.kts +++ b/Kotlin/workerEnabledTransformation/app/build.gradle.kts @@ -63,7 +63,6 @@ android { compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(29) } } androidComponents { diff --git a/Kotlin/workerEnabledTransformation/build.gradle.kts b/Kotlin/workerEnabledTransformation/build.gradle.kts index 36c8ad68..472da163 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.1.0-alpha13") - classpath(kotlin("gradle-plugin", version = "1.4.32")) + classpath("com.android.tools.build:gradle:7.2.0") + classpath(kotlin("gradle-plugin", version = "1.5.31")) } }