From 2ee11dd930066a1c75e997dbc2b4f5139d1b3bcc Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Fri, 12 Jul 2024 04:46:13 -0400 Subject: [PATCH] Remove nonTransitiveRClass flags It's the default from AGP 8.0, see https://developer.android.com/build/releases/past-releases/agp-8-0-0-release-notes#default-changes --- addBuildTypeUsingDslFinalize/gradle.properties | 4 ---- addCustomBuildConfigFields/gradle.properties | 4 ---- addCustomSourceType/gradle.properties | 4 ---- addGeneratedSourceFolder/gradle.properties | 4 ---- addMultipleArtifact/gradle.properties | 4 ---- allProjectsApkAction/gradle.properties | 4 ---- appendToMultipleArtifact/gradle.properties | 4 ---- asmTransformClasses/gradle.properties | 4 ---- createSingleArtifact/gradle.properties | 6 +----- extendingAgp/gradle.properties | 4 ---- getMultipleArtifact/gradle.properties | 4 ---- getScopedArtifacts/gradle.properties | 4 ---- getSingleArtifact/gradle.properties | 4 ---- legacyTaskBridging/gradle.properties | 4 ---- listenToArtifacts/gradle.properties | 4 ---- onVariants/gradle.properties | 4 ---- perVariantManifestPlaceholder/gradle.properties | 4 ---- registerPreBuild/gradle.properties | 4 ---- selectVariants/gradle.properties | 4 ---- testFixtures/gradle.properties | 4 ---- transformAllClasses/gradle.properties | 4 ---- transformDirectory/gradle.properties | 4 ---- transformManifest/gradle.properties | 4 ---- transformMultiple/gradle.properties | 4 ---- variantDependencySubstitutionTest/gradle.properties | 4 ---- variantOutput/gradle.properties | 4 ---- workerEnabledTransformation/gradle.properties | 4 ---- 27 files changed, 1 insertion(+), 109 deletions(-) diff --git a/addBuildTypeUsingDslFinalize/gradle.properties b/addBuildTypeUsingDslFinalize/gradle.properties index 55cce922..1ec25e0a 100644 --- a/addBuildTypeUsingDslFinalize/gradle.properties +++ b/addBuildTypeUsingDslFinalize/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/addCustomBuildConfigFields/gradle.properties b/addCustomBuildConfigFields/gradle.properties index 55cce922..1ec25e0a 100644 --- a/addCustomBuildConfigFields/gradle.properties +++ b/addCustomBuildConfigFields/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/addCustomSourceType/gradle.properties b/addCustomSourceType/gradle.properties index 55cce922..1ec25e0a 100644 --- a/addCustomSourceType/gradle.properties +++ b/addCustomSourceType/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/addGeneratedSourceFolder/gradle.properties b/addGeneratedSourceFolder/gradle.properties index 55cce922..1ec25e0a 100644 --- a/addGeneratedSourceFolder/gradle.properties +++ b/addGeneratedSourceFolder/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/addMultipleArtifact/gradle.properties b/addMultipleArtifact/gradle.properties index 55cce922..1ec25e0a 100644 --- a/addMultipleArtifact/gradle.properties +++ b/addMultipleArtifact/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/allProjectsApkAction/gradle.properties b/allProjectsApkAction/gradle.properties index 55cce922..1ec25e0a 100644 --- a/allProjectsApkAction/gradle.properties +++ b/allProjectsApkAction/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/appendToMultipleArtifact/gradle.properties b/appendToMultipleArtifact/gradle.properties index 55cce922..1ec25e0a 100644 --- a/appendToMultipleArtifact/gradle.properties +++ b/appendToMultipleArtifact/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/asmTransformClasses/gradle.properties b/asmTransformClasses/gradle.properties index 55cce922..1ec25e0a 100644 --- a/asmTransformClasses/gradle.properties +++ b/asmTransformClasses/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/createSingleArtifact/gradle.properties b/createSingleArtifact/gradle.properties index 55cce922..e6e25e05 100644 --- a/createSingleArtifact/gradle.properties +++ b/createSingleArtifact/gradle.properties @@ -16,8 +16,4 @@ org.gradle.parallel=true # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true +kotlin.code.style=official \ No newline at end of file diff --git a/extendingAgp/gradle.properties b/extendingAgp/gradle.properties index 55cce922..1ec25e0a 100644 --- a/extendingAgp/gradle.properties +++ b/extendingAgp/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/getMultipleArtifact/gradle.properties b/getMultipleArtifact/gradle.properties index 55cce922..1ec25e0a 100644 --- a/getMultipleArtifact/gradle.properties +++ b/getMultipleArtifact/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/getScopedArtifacts/gradle.properties b/getScopedArtifacts/gradle.properties index 55cce922..1ec25e0a 100644 --- a/getScopedArtifacts/gradle.properties +++ b/getScopedArtifacts/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/getSingleArtifact/gradle.properties b/getSingleArtifact/gradle.properties index 55cce922..1ec25e0a 100644 --- a/getSingleArtifact/gradle.properties +++ b/getSingleArtifact/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/legacyTaskBridging/gradle.properties b/legacyTaskBridging/gradle.properties index 55cce922..1ec25e0a 100644 --- a/legacyTaskBridging/gradle.properties +++ b/legacyTaskBridging/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/listenToArtifacts/gradle.properties b/listenToArtifacts/gradle.properties index 55cce922..1ec25e0a 100644 --- a/listenToArtifacts/gradle.properties +++ b/listenToArtifacts/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/onVariants/gradle.properties b/onVariants/gradle.properties index 55cce922..1ec25e0a 100644 --- a/onVariants/gradle.properties +++ b/onVariants/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/perVariantManifestPlaceholder/gradle.properties b/perVariantManifestPlaceholder/gradle.properties index 55cce922..1ec25e0a 100644 --- a/perVariantManifestPlaceholder/gradle.properties +++ b/perVariantManifestPlaceholder/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/registerPreBuild/gradle.properties b/registerPreBuild/gradle.properties index 55cce922..1ec25e0a 100644 --- a/registerPreBuild/gradle.properties +++ b/registerPreBuild/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/selectVariants/gradle.properties b/selectVariants/gradle.properties index 55cce922..1ec25e0a 100644 --- a/selectVariants/gradle.properties +++ b/selectVariants/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/testFixtures/gradle.properties b/testFixtures/gradle.properties index 55cce922..1ec25e0a 100644 --- a/testFixtures/gradle.properties +++ b/testFixtures/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/transformAllClasses/gradle.properties b/transformAllClasses/gradle.properties index 55cce922..1ec25e0a 100644 --- a/transformAllClasses/gradle.properties +++ b/transformAllClasses/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/transformDirectory/gradle.properties b/transformDirectory/gradle.properties index 55cce922..1ec25e0a 100644 --- a/transformDirectory/gradle.properties +++ b/transformDirectory/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/transformManifest/gradle.properties b/transformManifest/gradle.properties index 55cce922..1ec25e0a 100644 --- a/transformManifest/gradle.properties +++ b/transformManifest/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/transformMultiple/gradle.properties b/transformMultiple/gradle.properties index 55cce922..1ec25e0a 100644 --- a/transformMultiple/gradle.properties +++ b/transformMultiple/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/variantDependencySubstitutionTest/gradle.properties b/variantDependencySubstitutionTest/gradle.properties index 55cce922..1ec25e0a 100644 --- a/variantDependencySubstitutionTest/gradle.properties +++ b/variantDependencySubstitutionTest/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/variantOutput/gradle.properties b/variantOutput/gradle.properties index 55cce922..1ec25e0a 100644 --- a/variantOutput/gradle.properties +++ b/variantOutput/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true diff --git a/workerEnabledTransformation/gradle.properties b/workerEnabledTransformation/gradle.properties index 55cce922..1ec25e0a 100644 --- a/workerEnabledTransformation/gradle.properties +++ b/workerEnabledTransformation/gradle.properties @@ -17,7 +17,3 @@ org.gradle.parallel=true android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true