Merge pull request #1140 from android/av/agp-8.3.x

Update AGP to 8.3.0
android · Mar 5, 2024 · 8c88df0 · 8c88df0
2 parents 1135918 + 1d91231
commit 8c88df0
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -113,10 +113,12 @@ dependencies {
 
     testDemoImplementation(libs.robolectric)
     testDemoImplementation(libs.roborazzi)
+    testDemoImplementation(projects.core.screenshotTesting)
 
     androidTestImplementation(projects.core.testing)
     androidTestImplementation(projects.core.dataTest)
     androidTestImplementation(projects.core.datastoreTest)
+    androidTestImplementation(libs.androidx.test.espresso.core)
     androidTestImplementation(libs.androidx.navigation.testing)
     androidTestImplementation(libs.accompanist.testharness)
     androidTestImplementation(libs.hilt.android.testing)

diff --git a/...d-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt b/...d-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures {

diff --git a/...c/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt b/...c/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt
@@ -25,7 +25,7 @@ import org.gradle.kotlin.dsl.invoke
  * Configure project for Gradle managed devices
  */
 internal fun configureGradleManagedDevices(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     val pixel4 = DeviceConfig("Pixel 4", 30, "aosp-atd")
     val pixel6 = DeviceConfig("Pixel 6", 31, "aosp")

diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = 34

diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt
@@ -20,7 +20,7 @@ enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: St
 }
 
 fun configureFlavors(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
     flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}
 ) {
     commonExtension.apply {

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -47,6 +47,7 @@ dependencies {
     testImplementation(libs.hilt.android.testing)
     testImplementation(libs.robolectric)
     testImplementation(libs.roborazzi)
+    testImplementation(projects.core.screenshotTesting)
     testImplementation(projects.core.testing)
 
     androidTestImplementation(libs.androidx.compose.ui.test)

diff --git a/core/screenshot-testing/.gitignore b/core/screenshot-testing/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/core/screenshot-testing/build.gradle.kts b/core/screenshot-testing/build.gradle.kts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * 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.
+ */
+plugins {
+    alias(libs.plugins.nowinandroid.android.library)
+    alias(libs.plugins.nowinandroid.android.library.compose)
+    alias(libs.plugins.nowinandroid.android.hilt)
+}
+
+android {
+    namespace = "com.google.samples.apps.nowinandroid.core.screenshottesting"
+}
+
+dependencies {
+    api(libs.roborazzi)
+    implementation(libs.accompanist.testharness)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.compose.ui.test)
+    implementation(libs.robolectric)
+    implementation(projects.core.common)
+    implementation(projects.core.designsystem)
+}
diff --git a/core/screenshot-testing/src/main/AndroidManifest.xml b/core/screenshot-testing/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2022 The Android Open Source Project
+
+     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
+
+          http://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.
+-->
+<manifest />
diff --git a/...oid/core/testing/util/ScreenshotHelper.kt → ...oid/core/testing/util/ScreenshotHelper.kt b/...oid/core/testing/util/ScreenshotHelper.kt → ...oid/core/testing/util/ScreenshotHelper.kt
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
@@ -26,21 +26,17 @@ android {
 dependencies {
     api(kotlin("test"))
     api(libs.androidx.compose.ui.test)
-    api(libs.roborazzi)
     api(projects.core.analytics)
     api(projects.core.data)
     api(projects.core.model)
     api(projects.core.notifications)
 
     debugApi(libs.androidx.compose.ui.testManifest)
 
-    implementation(libs.accompanist.testharness)
-    implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.test.rules)
     implementation(libs.hilt.android.testing)
     implementation(libs.kotlinx.coroutines.test)
     implementation(libs.kotlinx.datetime)
-    implementation(libs.robolectric.shadows)
     implementation(projects.core.common)
     implementation(projects.core.designsystem)
 }
diff --git a/feature/foryou/build.gradle.kts b/feature/foryou/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     testImplementation(libs.hilt.android.testing)
     testImplementation(libs.robolectric)
     testImplementation(projects.core.testing)
+    testImplementation(projects.core.screenshotTesting)
     testDemoImplementation(libs.roborazzi)
 
     androidTestImplementation(projects.core.testing)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 accompanist = "0.32.0"
 androidDesugarJdkLibs = "2.0.4"
 # AGP and tools should be updated together
-androidGradlePlugin = "8.2.0"
-androidTools = "31.2.0"
+androidGradlePlugin = "8.3.0"
+androidTools = "31.3.0"
 androidxActivity = "1.8.0"
 androidxAppCompat = "1.6.1"
 androidxBrowser = "1.6.0"
@@ -128,7 +128,6 @@ protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref
 retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofit-kotlin-serialization = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinxSerializationJson" }
 robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
-robolectric-shadows = { group = "org.robolectric", name = "shadows-framework", version.ref = "robolectric" }
 roborazzi = { group = "io.github.takahirom.roborazzi", name = "roborazzi", version.ref = "roborazzi" }
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -36,6 +36,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 include(":app")
 include(":app-nia-catalog")
 include(":benchmarks")
+include(":core:analytics")
 include(":core:common")
 include(":core:data")
 include(":core:data-test")
@@ -47,10 +48,10 @@ include(":core:designsystem")
 include(":core:domain")
 include(":core:model")
 include(":core:network")
-include(":core:ui")
-include(":core:testing")
-include(":core:analytics")
 include(":core:notifications")
+include(":core:screenshot-testing")
+include(":core:testing")
+include(":core:ui")
 
 include(":feature:foryou")
 include(":feature:interests")

diff --git a/sync/work/build.gradle.kts b/sync/work/build.gradle.kts
@@ -40,6 +40,5 @@ dependencies {
 
     androidTestImplementation(libs.androidx.work.testing)
     androidTestImplementation(libs.hilt.android.testing)
-    androidTestImplementation(libs.kotlinx.coroutines.guava)
     androidTestImplementation(projects.core.testing)
 }