From f80bb7efb5a855e44918f45deae1a0cd8373683a Mon Sep 17 00:00:00 2001 From: Tom Tresansky Date: Fri, 14 Jun 2024 15:51:42 -0400 Subject: [PATCH] Upgrade the Gradle wrapper to the latest nightly, requiring conventions to be explicitly enabled in projects --- app-nia-catalog/build.gradle.dcl | 5 ++++- app/build.gradle.dcl | 28 +++++++++++++++++++----- core/common/build.gradle.dcl | 4 +++- core/data-test/build.gradle.dcl | 4 +++- core/data/build.gradle.dcl | 12 +++++++--- core/database/build.gradle.dcl | 12 +++++++--- core/datastore-proto/build.gradle.dcl | 1 + core/datastore/build.gradle.dcl | 8 +++++-- core/domain/build.gradle.dcl | 4 +++- feature/bookmarks/build.gradle.dcl | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 2 +- 11 files changed, 65 insertions(+), 20 deletions(-) diff --git a/app-nia-catalog/build.gradle.dcl b/app-nia-catalog/build.gradle.dcl index e1aa749a6b..66e9c8e4a0 100644 --- a/app-nia-catalog/build.gradle.dcl +++ b/app-nia-catalog/build.gradle.dcl @@ -26,9 +26,12 @@ androidApplication { implementation(project(":core:ui")) } - compose {} + compose { + enabled = true + } dependencyGuard { + enabled = true configurationName = "releaseRuntimeClasspath" } diff --git a/app/build.gradle.dcl b/app/build.gradle.dcl index 24609926b8..2405d349ab 100644 --- a/app/build.gradle.dcl +++ b/app/build.gradle.dcl @@ -39,12 +39,21 @@ androidApplication { implementation("io.coil-kt:coil:2.6.0") } - compose {} - hilt {} - flavors {} - licenses {} + compose { + enabled = true + } + hilt { + enabled = true + } + flavors { + enabled = true + } + licenses { + enabled = true + } firebase { + enabled = true version = "32.4.0" // Disable the Crashlytics mapping file upload. This feature should only be @@ -54,6 +63,8 @@ androidApplication { } baselineProfile { + enabled = true + // Don't build on every iteration of a full assemble. // Instead enable generation directly for the release build variant. automaticGenerationDuringBuild = false @@ -64,6 +75,7 @@ androidApplication { } dependencyGuard { + enabled = true configurationName = "prodReleaseRuntimeClasspath" } @@ -144,8 +156,12 @@ androidApplication { includeAndroidResources = true } - jacoco {} - roborazzi {} + jacoco { + enabled = true + } + roborazzi { + enabled = true + } } // TODO:DG - Packaging diff --git a/core/common/build.gradle.dcl b/core/common/build.gradle.dcl index 3a0060cdb0..d0fd91bb88 100644 --- a/core/common/build.gradle.dcl +++ b/core/common/build.gradle.dcl @@ -1,7 +1,9 @@ androidLibrary { namespace = "com.google.samples.apps.nowinandroid.core.common" - hilt {} + hilt { + enabled = true + } testing { dependencies { diff --git a/core/data-test/build.gradle.dcl b/core/data-test/build.gradle.dcl index 5e28ad1a30..993d70a12b 100644 --- a/core/data-test/build.gradle.dcl +++ b/core/data-test/build.gradle.dcl @@ -7,5 +7,7 @@ androidLibrary { implementation("com.google.dagger:hilt-android-testing:2.51") } - hilt {} + hilt { + enabled = true + } } diff --git a/core/data/build.gradle.dcl b/core/data/build.gradle.dcl index 51a94d2834..14313fa426 100644 --- a/core/data/build.gradle.dcl +++ b/core/data/build.gradle.dcl @@ -11,8 +11,12 @@ androidLibrary { implementation(project(":core:notifications")) } - hilt {} - kotlinSerialization {} + hilt { + enabled = true + } + kotlinSerialization { + enabled = true + } testing { dependencies { @@ -22,7 +26,9 @@ androidLibrary { implementation(project(":core:network")) } - jacoco {} + jacoco { + enabled = true + } testOptions { includeAndroidResources = true diff --git a/core/database/build.gradle.dcl b/core/database/build.gradle.dcl index a6db38ed03..e54b608611 100644 --- a/core/database/build.gradle.dcl +++ b/core/database/build.gradle.dcl @@ -7,15 +7,21 @@ androidLibrary { implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0") } - room {} - hilt {} + room { + enabled = true + } + hilt { + enabled = true + } testing { dependencies { androidImplementation(project(":core:testing")) } - jacoco {} + jacoco { + enabled = true + } } } diff --git a/core/datastore-proto/build.gradle.dcl b/core/datastore-proto/build.gradle.dcl index 474a8f15a9..e6e456d0c5 100644 --- a/core/datastore-proto/build.gradle.dcl +++ b/core/datastore-proto/build.gradle.dcl @@ -3,6 +3,7 @@ androidLibrary { // Setup protobuf configuration, generating lite Java and Kotlin classes protobuf { + enabled = true option = "lite" // TODO: This is modeled in a very limited manner for now } } diff --git a/core/datastore/build.gradle.dcl b/core/datastore/build.gradle.dcl index 4842d8adeb..db14ba4fe7 100644 --- a/core/datastore/build.gradle.dcl +++ b/core/datastore/build.gradle.dcl @@ -12,7 +12,9 @@ androidLibrary { implementation(project(":core:common")) } - hilt {} + hilt { + enabled = true + } testing { dependencies { @@ -24,6 +26,8 @@ androidLibrary { returnDefaultValues = true } - jacoco {} + jacoco { + enabled = true + } } } diff --git a/core/domain/build.gradle.dcl b/core/domain/build.gradle.dcl index 2cae7cc8fb..cf199effdb 100644 --- a/core/domain/build.gradle.dcl +++ b/core/domain/build.gradle.dcl @@ -13,6 +13,8 @@ androidLibrary { implementation(project(":core:testing")) } - jacoco {} + jacoco { + enabled = true + } } } diff --git a/feature/bookmarks/build.gradle.dcl b/feature/bookmarks/build.gradle.dcl index 9007211114..19cd162a5c 100644 --- a/feature/bookmarks/build.gradle.dcl +++ b/feature/bookmarks/build.gradle.dcl @@ -5,9 +5,12 @@ androidLibrary { implementation(project(":core:data")) } - feature {} + feature { + enabled = true + } compose { + enabled = true stabilityConfigurationFilePath = "/compose_compiler_config.conf" experimentalStrongSkipping = true } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 55e52c4919..fad86b1548 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.9-20240522004149+0000-bin.zip +distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.10-20240614182247+0000-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME