Prepare fiam for AGP upgrade. (#4007)

* Remove redundant duplicate symbols
* Move TestActivity to proper java package
* Cleanup manifests and build files

Author: vkryachko

firebase-inappmessaging-display/firebase-inappmessaging-display.gradle

@@ -43,8 +43,6 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-        // Neccesary for Dagger
-        incremental = false
     }
 
     sourceSets {

firebase-inappmessaging-display/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.firebase.inappmessaging.display.internal.bindingwrappers">
+    package="com.google.firebase.inappmessaging.display.test">
 
   <application>
     <uses-library android:name="android.test.runner"/>
@@ -11,9 +11,4 @@
       </intent-filter>
     </activity>
   </application>
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="com.google.firebase.inappmessaging.display.internal.bindingwrappers">
-  </instrumentation>
 </manifest>

firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/BannerBindingWrapperTest.java

@@ -27,6 +27,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import java.util.HashMap;
 import java.util.Map;

firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/CardBindingWrapperTest.java

@@ -35,6 +35,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import com.google.firebase.inappmessaging.model.CardMessage;
 import java.util.HashMap;

firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ImageBindingWrapperTest.java

@@ -27,6 +27,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import java.util.HashMap;
 import java.util.Map;

firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/ModalBindingWrapperTest.java

@@ -34,6 +34,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.inappmessaging.display.internal.InAppMessageLayoutConfig;
 import com.google.firebase.inappmessaging.display.internal.injection.modules.InflaterConfigModule;
+import com.google.firebase.inappmessaging.display.test.TestActivity;
 import com.google.firebase.inappmessaging.model.Action;
 import com.google.firebase.inappmessaging.model.ModalMessage;
 import java.util.HashMap;

firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/internal/bindingwrappers/TestActivity.java renamed to firebase-inappmessaging-display/src/androidTest/java/com/google/firebase/inappmessaging/display/test/TestActivity.java

@@ -11,8 +11,7 @@
 // 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.
-
-package com.google.firebase.inappmessaging.display.internal.bindingwrappers;
+package com.google.firebase.inappmessaging.display.test;
 
 import android.app.Activity;
 

firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/btn_clear.xml

@@ -85,8 +85,6 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-        // Neccesary for Dagger
-        incremental = false
     }
     testOptions {
         unitTests {
@@ -95,15 +93,6 @@ android {
     }
 }
 
-configurations.all {
-    if(it.name.contains('AndroidTestRuntimeClasspath')) {
-        it.resolutionStrategy {
-            force 'org.checkerframework:checker-compat-qual:2.5.5'
-            force 'com.google.guava:guava:30.1.1-android'
-        }
-    }
-}
-
 
 thirdPartyLicenses {
     add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"

firebase-inappmessaging-display/src/main/res/drawable-anydpi-v21/image_placeholder.xml

@@ -14,8 +14,4 @@
               android:value="com.google.firebase.components.ComponentRegistrar" />
     </service>
   </application>
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="com.google.firebase.inappmessaging"/>
 </manifest>