gradle: Bump AGP to 7.1.2

1. Bump AGP to 7.1.2.
2. Bump hiltVersion to 2.38.1.
3. Migrate lintOptions to lint.
4. Move package from AndroidManifest to Gradle.
5. Fully qualify application class name.
6. Fix packagingOptions usage with resources wrapper.

Signed-off-by: utzcoz <utzcoz@outlook.com>
Signed-off-by: Ryan Pavlik <ryan.pavlik@collabora.com>

build.gradle

@@ -15,7 +15,7 @@ buildscript {
         androidxCardViewVersion = '1.0.0'
         androidxRecyclerViewVersion = '1.2.1'
 
-        hiltVersion = '2.37'
+        hiltVersion = '2.38.1'
 
         materialVersion = "1.3.0"
 
@@ -36,8 +36,8 @@ buildscript {
 }
 plugins {
     // Android Gradle Plugin
-    id 'com.android.application' version '7.0.4' apply false
-    id 'com.android.library' version '7.0.4' apply false
+    id 'com.android.application' version '7.1.2' apply false
+    id 'com.android.library' version '7.1.2' apply false
 
     id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
 

src/xrt/auxiliary/android/build.gradle

@@ -24,15 +24,18 @@ android {
         }
     }
 
-    lintOptions {
-        fatal 'StopShip'
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
+    }
+    namespace 'org.freedesktop.monado.auxiliary'
+    lint {
+        fatal 'StopShip'
     }
 }
 

src/xrt/auxiliary/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.freedesktop.monado.auxiliary">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 <!--
     Copyright 2020, Collabora, Ltd.
     SPDX-License-Identifier: BSL-1.0

src/xrt/ipc/android/build.gradle

@@ -39,15 +39,18 @@ android {
         }
     }
 
-    lintOptions {
-        fatal 'StopShip'
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
+    }
+    namespace 'org.freedesktop.monado.ipc'
+    lint {
+        fatal 'StopShip'
     }
 }
 

src/xrt/ipc/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.freedesktop.monado.ipc">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--
         Copyright 2020, Collabora, Ltd.
         SPDX-License-Identifier: BSL-1.0

src/xrt/targets/android_common/build.gradle

@@ -31,15 +31,18 @@ android {
         }
     }
 
-    lintOptions {
-        fatal 'StopShip'
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
+    }
+    namespace 'org.freedesktop.monado.android_common'
+    lint {
+        fatal 'StopShip'
     }
 }
 

src/xrt/targets/android_common/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="org.freedesktop.monado.android_common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!--
         Copyright 2020, Collabora, Ltd.
         SPDX-License-Identifier: BSL-1.0

src/xrt/targets/openxr_android/build.gradle

@@ -148,9 +148,6 @@ android {
         }
     }
 
-    lintOptions {
-        fatal 'StopShip'
-    }
 
     flavorDimensions 'deployment'
     productFlavors {
@@ -178,7 +175,13 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
+        resources {
+            excludes += ['META-INF/*.kotlin_module']
+        }
+    }
+    namespace 'org.freedesktop.monado.openxr_runtime'
+    lint {
+        fatal 'StopShip'
     }
 
 }

src/xrt/targets/openxr_android/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.freedesktop.monado.openxr_runtime">
+    xmlns:tools="http://schemas.android.com/tools">
     <!--
         Copyright 2020-2022, Collabora, Ltd.
         SPDX-License-Identifier: BSL-1.0