The open source OpenXR runtime
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>
authored by
utzcoz
and committed by
Ryan Pavlik
7676fa0a
92f7e360
+35
-27
+3
-3
build.gradle
+3
-3
build.gradle
···
15
15
androidxCardViewVersion = '1.0.0'
16
16
androidxRecyclerViewVersion = '1.2.1'
17
17
18
-
hiltVersion = '2.37'
18
+
hiltVersion = '2.38.1'
19
19
20
20
materialVersion = "1.3.0"
21
21
···
36
36
}
37
37
plugins {
38
38
// Android Gradle Plugin
39
-
id 'com.android.application' version '7.0.4' apply false
40
-
id 'com.android.library' version '7.0.4' apply false
39
+
id 'com.android.application' version '7.1.2' apply false
40
+
id 'com.android.library' version '7.1.2' apply false
41
41
42
42
id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
43
43
+7
-4
src/xrt/auxiliary/android/build.gradle
+7
-4
src/xrt/auxiliary/android/build.gradle
···
24
24
}
25
25
}
26
26
27
-
lintOptions {
28
-
fatal 'StopShip'
29
-
}
30
27
compileOptions {
31
28
sourceCompatibility JavaVersion.VERSION_1_8
32
29
targetCompatibility JavaVersion.VERSION_1_8
33
30
}
34
31
packagingOptions {
35
-
exclude("META-INF/*.kotlin_module")
32
+
resources {
33
+
excludes += ['META-INF/*.kotlin_module']
34
+
}
35
+
}
36
+
namespace 'org.freedesktop.monado.auxiliary'
37
+
lint {
38
+
fatal 'StopShip'
36
39
}
37
40
}
38
41
+1
-2
src/xrt/auxiliary/android/src/main/AndroidManifest.xml
+1
-2
src/xrt/auxiliary/android/src/main/AndroidManifest.xml
+7
-4
src/xrt/ipc/android/build.gradle
+7
-4
src/xrt/ipc/android/build.gradle
···
39
39
}
40
40
}
41
41
42
-
lintOptions {
43
-
fatal 'StopShip'
44
-
}
45
42
compileOptions {
46
43
sourceCompatibility JavaVersion.VERSION_1_8
47
44
targetCompatibility JavaVersion.VERSION_1_8
48
45
}
49
46
packagingOptions {
50
-
exclude("META-INF/*.kotlin_module")
47
+
resources {
48
+
excludes += ['META-INF/*.kotlin_module']
49
+
}
50
+
}
51
+
namespace 'org.freedesktop.monado.ipc'
52
+
lint {
53
+
fatal 'StopShip'
51
54
}
52
55
}
53
56
+1
-2
src/xrt/ipc/android/src/main/AndroidManifest.xml
+1
-2
src/xrt/ipc/android/src/main/AndroidManifest.xml
+7
-4
src/xrt/targets/android_common/build.gradle
+7
-4
src/xrt/targets/android_common/build.gradle
···
31
31
}
32
32
}
33
33
34
-
lintOptions {
35
-
fatal 'StopShip'
36
-
}
37
34
compileOptions {
38
35
sourceCompatibility JavaVersion.VERSION_1_8
39
36
targetCompatibility JavaVersion.VERSION_1_8
40
37
}
41
38
packagingOptions {
42
-
exclude("META-INF/*.kotlin_module")
39
+
resources {
40
+
excludes += ['META-INF/*.kotlin_module']
41
+
}
42
+
}
43
+
namespace 'org.freedesktop.monado.android_common'
44
+
lint {
45
+
fatal 'StopShip'
43
46
}
44
47
}
45
48
+1
-2
src/xrt/targets/android_common/src/main/AndroidManifest.xml
+1
-2
src/xrt/targets/android_common/src/main/AndroidManifest.xml
···
1
1
<?xml version="1.0" encoding="utf-8"?>
2
-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
-
package="org.freedesktop.monado.android_common">
2
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
4
3
<!--
5
4
Copyright 2020, Collabora, Ltd.
6
5
SPDX-License-Identifier: BSL-1.0
+7
-4
src/xrt/targets/openxr_android/build.gradle
+7
-4
src/xrt/targets/openxr_android/build.gradle
···
148
148
}
149
149
}
150
150
151
-
lintOptions {
152
-
fatal 'StopShip'
153
-
}
154
151
155
152
flavorDimensions 'deployment'
156
153
productFlavors {
···
178
175
targetCompatibility JavaVersion.VERSION_1_8
179
176
}
180
177
packagingOptions {
181
-
exclude("META-INF/*.kotlin_module")
178
+
resources {
179
+
excludes += ['META-INF/*.kotlin_module']
180
+
}
181
+
}
182
+
namespace 'org.freedesktop.monado.openxr_runtime'
183
+
lint {
184
+
fatal 'StopShip'
182
185
}
183
186
184
187
}
+1
-2
src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
+1
-2
src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
···
1
1
<?xml version="1.0" encoding="utf-8"?>
2
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
-
xmlns:tools="http://schemas.android.com/tools"
4
-
package="org.freedesktop.monado.openxr_runtime">
3
+
xmlns:tools="http://schemas.android.com/tools">
5
4
<!--
6
5
Copyright 2020-2022, Collabora, Ltd.
7
6
SPDX-License-Identifier: BSL-1.0