Update firebase-appdistribution/test-app to target API level 34 (#6229)

firebase · Sep 5, 2024 · 2eb7cd7 · 2eb7cd7
1 parent b994bd4
commit 2eb7cd7
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/firebase-appdistribution/test-app/src/main/AndroidManifest.xml b/firebase-appdistribution/test-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.googletest.firebase.appdistribution.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
   <application

diff --git a/...main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationActivity.kt b/...main/kotlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationActivity.kt
@@ -24,6 +24,7 @@ import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.google.firebase.appdistribution.testapp.R
 import java.util.*
 
 class CustomNotificationActivity : AppCompatActivity() {

diff --git a/...tlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationFeedbackTrigger.kt b/...tlin/com/googletest/firebase/appdistribution/testapp/CustomNotificationFeedbackTrigger.kt
@@ -34,6 +34,7 @@ import androidx.core.content.ContextCompat
 import com.google.firebase.appdistribution.ktx.appDistribution
 import com.google.firebase.ktx.Firebase
 import java.io.IOException
+import com.google.firebase.appdistribution.testapp.R
 
 /**
  * Shows an ongoing notification that the user can tap to take a screenshot and send feedback to the

diff --git a/.../test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/MainActivity.kt b/.../test-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/MainActivity.kt
@@ -43,9 +43,11 @@ import com.google.firebase.appdistribution.AppDistributionRelease
 import com.google.firebase.appdistribution.InterruptionLevel
 import com.google.firebase.appdistribution.UpdateProgress
 import com.google.firebase.appdistribution.ktx.appDistribution
+import com.google.firebase.appdistribution.testapp.BuildConfig
 import com.google.firebase.ktx.Firebase
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
+import com.google.firebase.appdistribution.testapp.R
 
 class MainActivity : AppCompatActivity() {
 

diff --git a/...ain/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionActivity.kt b/...ain/kotlin/com/googletest/firebase/appdistribution/testapp/ScreenshotDetectionActivity.kt
@@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.googletest.firebase.appdistribution.testapp.ScreenshotDetectionFeedbackTrigger.Companion.screenshotReadPermission
 import java.util.*
+import com.google.firebase.appdistribution.testapp.R
 
 class ScreenshotDetectionActivity : AppCompatActivity() {
   private val handlerThread = HandlerThread("AppDistroFeedbackTrigger").also { it.start() }

diff --git a/...est-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt b/...est-app/src/main/kotlin/com/googletest/firebase/appdistribution/testapp/SecondActivity.kt
@@ -25,6 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatButton
 import com.google.firebase.appdistribution.ktx.appDistribution
 import com.google.firebase.ktx.Firebase
+import com.google.firebase.appdistribution.testapp.R
 
 class SecondActivity : AppCompatActivity() {
 

diff --git a/...n/kotlin/com/googletest/firebase/appdistribution/testapp/ShakeDetectionFeedbackTrigger.kt b/...n/kotlin/com/googletest/firebase/appdistribution/testapp/ShakeDetectionFeedbackTrigger.kt
@@ -24,6 +24,7 @@ import android.util.Log
 import com.google.firebase.appdistribution.ktx.appDistribution
 import com.google.firebase.ktx.Firebase
 import com.squareup.seismic.ShakeDetector
+import com.google.firebase.appdistribution.testapp.R
 
 /**
  * Listens to the device accelerometer, and starts App Distribution in-app feedback when the user

diff --git a/firebase-appdistribution/test-app/test-app.gradle b/firebase-appdistribution/test-app/test-app.gradle
@@ -25,14 +25,18 @@ android {
 
     defaultConfig {
         applicationId "com.googletest.firebase.appdistribution.testapp"
-        minSdkVersion 23
-        targetSdkVersion 33
-        versionName "3.2"
-        versionCode 7
+        minSdk 23
+        targetSdk 34
+        versionName "3.3"
+        versionCode 8
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
         release {
             // This is so we can build the "release" variant for the "test-app" (and the SDK) without
@@ -54,8 +58,8 @@ android {
             versionNameSuffix "-beta"
 
             firebaseAppDistribution {
-                releaseNotes "Beta variant of Android SDK test app"
-                // testers "your email here"
+                releaseNotes = "Beta variant of Android SDK test app"
+                // testers = "your email here"
             }
         }
     }