Upgrade AGP

alqubaty-12 · Sep 16, 2022 · 9072e37 · 9072e37
1 parent 66dfbe2
commit 9072e37
Show file tree

Hide file tree

Showing 54 changed files with 76 additions and 88 deletions.
diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -32,6 +32,7 @@ android {
  kotlinOptions {
  jvmTarget = '1.8'
  }
+ namespace 'org.odk.collect.analytics'
 }
 
 dependencies {

diff --git a/analytics/src/main/AndroidManifest.xml b/analytics/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.analytics">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  <uses-permission android:name="android.permission.INTERNET" />

diff --git a/androidshared/build.gradle b/androidshared/build.gradle
@@ -44,6 +44,7 @@ android {
  includeAndroidResources = true
  }
  }
+ namespace 'org.odk.collect.androidshared'
 }
 
 dependencies {

diff --git a/androidshared/src/main/AndroidManifest.xml b/androidshared/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.androidshared">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 

diff --git a/androidtest/build.gradle b/androidtest/build.gradle
@@ -28,6 +28,7 @@ android {
  minifyEnabled false
  }
  }
+ namespace 'org.odk.collect.androidtest'
 }
 dependencies {
  coreLibraryDesugaring Dependencies.desugar

diff --git a/androidtest/src/main/AndroidManifest.xml b/androidtest/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.androidtest">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/async/build.gradle b/async/build.gradle
@@ -30,10 +30,7 @@ android {
  targetCompatibility JavaVersion.VERSION_1_8
  }
 
- lintOptions {
- // There is a crash caused by this https://issuetracker.google.com/issues/151177986
- disable "InvalidPeriodicWorkRequestInterval"
- }
+ namespace 'org.odk.collect.async'
 }
 
 dependencies {

diff --git a/async/src/main/AndroidManifest.xml b/async/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.async">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/audioclips/build.gradle b/audioclips/build.gradle
@@ -28,6 +28,7 @@ android {
  minifyEnabled false
  }
  }
+ namespace 'org.odk.collect.audioclips'
 }
 
 dependencies {

diff --git a/audioclips/src/main/AndroidManifest.xml b/audioclips/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.audioclips">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
  /
 </manifest>
diff --git a/audiorecorder/build.gradle b/audiorecorder/build.gradle
@@ -35,6 +35,7 @@ android {
  testOptions {
  unitTests.includeAndroidResources = true
  }
+ namespace 'org.odk.collect.audiorecorder'
 }
 
 dependencies {

diff --git a/audiorecorder/src/main/AndroidManifest.xml b/audiorecorder/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.audiorecorder">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:7.2.1'
+ classpath 'com.android.tools.build:gradle:7.3.0'
  classpath 'com.google.gms:google-services:4.3.13'
  classpath 'org.jacoco:org.jacoco.core:0.8.8'
  classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'

diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -159,23 +159,13 @@ android {
  }
 
  packagingOptions {
- // Pick first occurrence of any files that cause conflicts, as defined
- // in common.gradle
- pickFirst 'META-INF/DEPENDENCIES'
- pickFirst 'META-INF/LICENSE'
- pickFirst 'META-INF/LICENSE.txt'
- pickFirst 'META-INF/NOTICE'
- pickFirst 'META-INF/NOTICE.txt'
- pickFirst 'META-INF/services/com.fasterxml.jackson.core.JsonFactory'
- pickFirst 'META-INF/services/com.fasterxml.jackson.core.ObjectCodec'
- pickFirst 'META-INF/services/javax.ws.rs.ext.MessageBodyReader'
- pickFirst 'META-INF/services/javax.ws.rs.ext.MessageBodyWriter'
- pickFirst 'draftv4/schema'
- pickFirst 'draftv3/schema'
-
- // These library licenses will be referenced in-app
- exclude 'META-INF/ASL-2.0.txt'
- exclude 'META-INF/LGPL-3.0.txt'
+ resources {
+ // These library licenses will be referenced in-app
+ excludes += ['META-INF/ASL-2.0.txt', 'META-INF/LGPL-3.0.txt']
+
+ // Pick first occurrence of any files that cause conflicts
+ pickFirsts += ['META-INF/DEPENDENCIES', 'META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/NOTICE', 'META-INF/NOTICE.txt', 'META-INF/services/com.fasterxml.jackson.core.JsonFactory', 'META-INF/services/com.fasterxml.jackson.core.ObjectCodec', 'META-INF/services/javax.ws.rs.ext.MessageBodyReader', 'META-INF/services/javax.ws.rs.ext.MessageBodyWriter', 'draftv4/schema', 'draftv3/schema']
+ }
 
  // To ensure that ODK Collect is installable on all devices, we don't use
  // abiFilters to exclude any ABIs; but to keep the APK slim, we include
@@ -213,14 +203,6 @@ android {
  }
  }
 
- lintOptions {
- abortOnError true
- xmlReport true
- htmlReport true
- checkGeneratedSources true
- checkDependencies true
- lintConfig file("${project.rootDir}/config/lint.xml")
- }
 
  sourceSets {
  androidTest {
@@ -230,6 +212,15 @@ android {
  java.srcDirs += "src/commonTest/java"
  }
  }
+ lint {
+ abortOnError true
+ checkDependencies true
+ checkGeneratedSources true
+ htmlReport true
+ lintConfig file("$rootDir/config/lint.xml")
+ xmlReport true
+ }
+ namespace 'org.odk.collect.android'
 }
 
 configurations.all {

diff --git a/collect_app/src/debug/AndroidManifest.xml b/collect_app/src/debug/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="https://schemas.android.com/apk/res/android"
- xmlns:tools="https://schemas.android.com/tools"
- package="org.odk.collect.android">
+ xmlns:tools="https://schemas.android.com/tools">
 
  <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
 

diff --git a/collect_app/src/main/AndroidManifest.xml b/collect_app/src/main/AndroidManifest.xml
@@ -9,7 +9,6 @@ the specific language governing permissions and limitations under the License.
 -->
 <manifest xmlns:android="https://schemas.android.com/apk/res/android"
  xmlns:tools="https://schemas.android.com/tools"
- package="org.odk.collect.android"
  tools:ignore="GoogleAppIndexingWarning">
 
  <uses-feature

diff --git a/errors/build.gradle b/errors/build.gradle
@@ -43,6 +43,7 @@ android {
  buildFeatures {
  viewBinding true
  }
+ namespace 'org.odk.collect.errors'
 }
 
 dependencies {

diff --git a/errors/src/main/AndroidManifest.xml b/errors/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.errors">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
  <application>
  <activity

diff --git a/externalapp/build.gradle b/externalapp/build.gradle
@@ -40,6 +40,7 @@ android {
  includeAndroidResources = true
  }
  }
+ namespace 'org.odk.collect.externalapp'
 }
 
 dependencies {

diff --git a/externalapp/src/main/AndroidManifest.xml b/externalapp/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.externalapp">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/fragmentstest/build.gradle b/fragmentstest/build.gradle
@@ -31,6 +31,7 @@ android {
  kotlinOptions {
  jvmTarget = '1.8'
  }
+ namespace 'org.odk.collect.fragmentstest'
 }
 
 dependencies {

diff --git a/fragmentstest/src/main/AndroidManifest.xml b/fragmentstest/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.fragmentstest">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/geo/build.gradle b/geo/build.gradle
@@ -45,6 +45,7 @@ android {
  buildFeatures {
  viewBinding true
  }
+ namespace 'org.odk.collect.geo'
 }
 
 dependencies {

diff --git a/geo/src/main/AndroidManifest.xml b/geo/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.geo">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
  <application>
  <activity

diff --git a/icons/build.gradle b/icons/build.gradle
@@ -29,6 +29,7 @@ android {
  sourceCompatibility JavaVersion.VERSION_1_8
  targetCompatibility JavaVersion.VERSION_1_8
  }
+ namespace 'org.odk.collect.icons'
 }
 
 dependencies {

diff --git a/icons/src/main/AndroidManifest.xml b/icons/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.odk.collect.icons">
+<manifest>
 
 </manifest>
diff --git a/imageloader/build.gradle b/imageloader/build.gradle
@@ -32,6 +32,7 @@ android {
  kotlinOptions {
  jvmTarget = '1.8'
  }
+ namespace 'org.odk.collect.imageloader'
 }
 
 dependencies {

diff --git a/imageloader/src/main/AndroidManifest.xml b/imageloader/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.imageloader">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/location/build.gradle b/location/build.gradle
@@ -40,6 +40,7 @@ android {
  includeAndroidResources = true
  }
  }
+ namespace 'org.odk.collect.location'
 }
 
 dependencies {

diff --git a/location/src/main/AndroidManifest.xml b/location/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.location">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
  <application>
  <service

diff --git a/mapbox/build.gradle b/mapbox/build.gradle
@@ -35,6 +35,8 @@ android {
  kotlinOptions {
  jvmTarget = '1.8'
  }
+
+ namespace 'org.odk.collect.mapbox'
 }
 
 dependencies {

diff --git a/mapbox/src/main/AndroidManifest.xml b/mapbox/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="https://schemas.android.com/apk/res/android"
- xmlns:tools="https://schemas.android.com/tools"
- package="org.odk.collect.mapbox">
+ xmlns:tools="https://schemas.android.com/tools">
 
  <application>
 

diff --git a/maps/build.gradle b/maps/build.gradle
@@ -45,6 +45,7 @@ android {
  buildFeatures {
  viewBinding true
  }
+ namespace 'org.odk.collect.maps'
 }
 
 dependencies {

diff --git a/maps/src/main/AndroidManifest.xml b/maps/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.maps">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/material/build.gradle b/material/build.gradle
@@ -36,6 +36,7 @@ android {
  includeAndroidResources = true
  }
  }
+ namespace 'org.odk.collect.material'
 }
 
 dependencies {

diff --git a/material/src/main/AndroidManifest.xml b/material/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.material" />
+<manifest xmlns:android="https://schemas.android.com/apk/res/android" />
diff --git a/nbistubs/build.gradle b/nbistubs/build.gradle
@@ -18,4 +18,5 @@ android {
  minifyEnabled false
  }
  }
+ namespace 'org.odk.collect.nbistubs'
 }
diff --git a/nbistubs/src/main/AndroidManifest.xml b/nbistubs/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.nbistubs" />
+<manifest xmlns:android="https://schemas.android.com/apk/res/android" />
diff --git a/osmdroid/build.gradle b/osmdroid/build.gradle
@@ -35,6 +35,7 @@ android {
  kotlinOptions {
  jvmTarget = '1.8'
  }
+ namespace 'org.odk.collect.osmdroid'
 }
 
 dependencies {

diff --git a/osmdroid/src/main/AndroidManifest.xml b/osmdroid/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.osmdroid">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/permissions/build.gradle b/permissions/build.gradle
@@ -39,6 +39,7 @@ android {
  includeAndroidResources = true
  }
  }
+ namespace 'org.odk.collect.permissions'
 }
 
 dependencies {

diff --git a/permissions/src/main/AndroidManifest.xml b/permissions/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.permissions">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/projects/build.gradle b/projects/build.gradle
@@ -45,6 +45,7 @@ android {
  includeAndroidResources = true
  }
  }
+ namespace 'org.odk.collect.projects'
 
 }
 

diff --git a/projects/src/main/AndroidManifest.xml b/projects/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="https://schemas.android.com/apk/res/android"
- package="org.odk.collect.projects">
+<manifest xmlns:android="https://schemas.android.com/apk/res/android">
 
 </manifest>