Merge branch 'main' into mrober/crashlyticsGradleFunctionalTests

Author: tejasd

.github/workflows/perf-gradle-compatibility-tests.yml

@@ -24,5 +24,5 @@ jobs:
         id: tests
         run: |
           ./gradlew \
-          :firebase-perf-gradle:test --tests \
+          :firebase-perf-gradle:functionalTest --tests \
           "com.google.firebase.perf.plugin.transform.InstrumentationApiCompatTest.gradleBuildRunsInstrumentationForAllVariants_latestGradleAndAgp"

firebase-appdistribution-gradle/src/integrationTest/java/com/google/firebase/appdistribution/gradle/UploadDistributionTaskTest.kt

@@ -724,7 +724,7 @@ class UploadDistributionTaskTest {
     // Also remember to update the latest AGP/gradle versions in BeePlusGradleProject.java.
     // firebase-appdistribution-gradle/src/prodTest/java/com/google/firebase/appdistribution/gradle/BeePlusGradleProject.java#L59-L60
     private const val LATEST_GRADLE_VERSION = "9.3.1"
-    private const val LATEST_AGP_VERSION = "9.1.0-alpha06"
+    private const val LATEST_AGP_VERSION = "9.1.0-alpha07"
     private const val LATEST_GOOGLE_SERVICES_VERSION = "4.4.4"
     // For tests against Gradle 9, we get the error:
     // "In order to compile Java 9+ source, please set compileSdkVersion to 30 or above"

firebase-appdistribution-gradle/src/prodTest/java/com/google/firebase/appdistribution/gradle/BeePlusGradleProject.java

@@ -58,7 +58,7 @@ private static String getRequiredSystemProperty(String propertyName) {
   static final String PACKAGE_NAME = "com.firebase.appdistribution.prober";
   // Also remember to update the latest AGP/gradle versions in UploadDistributionTaskTest.kt
   // firebase-appdistribution-gradle/src/integrationTest/java/com/google/firebase/appdistribution/gradle/UploadDistributionTaskTest.kt#L724-L726
-  static final String LATEST_AGP_VERSION = "9.1.0-alpha06";
+  static final String LATEST_AGP_VERSION = "9.1.0-alpha07";
   static final String LATEST_GRADLE_VERSION = "9.3.1";
   // The project number for App Distro Probes. We need to use this project
   // because this is the one that's actually linked to play for BeePlus,

firebase-appdistribution-gradle/src/prodTest/java/com/google/firebase/appdistribution/gradle/README

@@ -10,7 +10,7 @@ big changes, similar to how one would do manual testing via a test matrix.
 
 ### How to run
 
-Before running the tests, you need to create a `local.properties` file in the root directory of the `firebase-android-buildtools` project with the following properties:
+Before running the tests, you need to create a `local.properties` file in the root directory of the `firebase-android-sdk` project with the following properties:
 
 ```properties
 sdk.dir=<path_to_android_sdk>

firebase-perf-gradle/firebase-perf-gradle.gradle

@@ -36,6 +36,26 @@ gradlePlugin {
   }
 }
 
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/main/java']
+        }
+    }
+
+    test {
+        java {
+            srcDirs = ['src/test/java']
+        }
+    }
+
+    functionalTest {
+        java {
+            srcDirs = ['src/functionalTest/java']
+        }
+    }
+}
+
 // Write the plugin's classpath to a file to share with the tests.
 // Refer: https://docs.gradle.org/current/userguide/test_kit.html#sub:test-kit-classpath-injection
 task createClasspathManifest {
@@ -62,11 +82,8 @@ dependencies {
   compileOnly("com.google.guava:guava:30.1-jre")
   compileOnly("commons-io:commons-io:2.6")
 
-  // Deps required to run the tests
-  testRuntimeOnly(files(createClasspathManifest))
-  testImplementation(gradleTestKit())
+  // Deps for unit tests
   testImplementation("org.ow2.asm:asm:$project.asmApiVersion")
-  testImplementation("com.android.tools.build:gradle:3.4.1")
   testImplementation("commons-io:commons-io:2.6")
   testImplementation(platform("org.junit:junit-bom:5.10.0"))
   testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
@@ -76,10 +93,26 @@ dependencies {
   testImplementation("org.mockito:mockito-core:3.12.4")
   testImplementation("org.mockito:mockito-junit-jupiter:3.12.4")
 
-  testImplementation("com.google.android:android:4.1.1.4")
-  testImplementation("com.squareup.okhttp3:okhttp:4.8.1")
-  testImplementation("com.google.code.gson:gson:2.10.1")
-  testImplementation("io.ktor:ktor-client-apache:1.4.0")
+  // Deps for functional tests
+  functionalTestRuntimeOnly(files(createClasspathManifest))
+  functionalTestImplementation(gradleTestKit())
+  functionalTestImplementation("org.ow2.asm:asm:$project.asmApiVersion")
+  functionalTestImplementation("com.android.tools.build:gradle:7.2.0")
+  functionalTestImplementation("com.android.tools:common:30.0.0")
+  functionalTestImplementation("com.android.tools:sdk-common:30.0.0")
+  functionalTestImplementation("commons-io:commons-io:2.6")
+  functionalTestImplementation(platform("org.junit:junit-bom:5.10.0"))
+  functionalTestImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
+  functionalTestImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+  functionalTestImplementation("org.junit.jupiter:junit-jupiter-params:5.10.0")
+  functionalTestImplementation("com.google.truth:truth:0.42")
+  functionalTestImplementation("org.mockito:mockito-core:3.12.4")
+  functionalTestImplementation("org.mockito:mockito-junit-jupiter:3.12.4")
+  functionalTestImplementation("com.google.android:android:4.1.1.4")
+  functionalTestImplementation("com.squareup.okhttp3:okhttp:4.8.1")
+  functionalTestImplementation("com.google.code.gson:gson:2.10.1")
+  functionalTestImplementation("com.google.guava:guava:30.1-jre")
+  functionalTestImplementation("io.ktor:ktor-client-apache:1.4.0")
 }
 
 def props = new Properties()
@@ -136,7 +169,13 @@ publishing {
 }
 
 test {
+  useJUnitPlatform()
+}
+
+task functionalTest(type: Test) {
   maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+  testClassesDirs = sourceSets.functionalTest.output.classesDirs
+  classpath = sourceSets.functionalTest.runtimeClasspath
   testLogging.showExceptions = true
   useJUnitPlatform()
   filter {
@@ -152,3 +191,9 @@ test {
 tasks.withType(ValidatePlugins).configureEach {
   enableStricterValidation = true
 }
+
+afterEvaluate {
+  tasks.named("deviceCheck") {
+    dependsOn(functionalTest)
+  }
+}