fix(acij): make the android module compatible with AGP 8

aws-amplify · Oct 20, 2023 · 5b5391f · 5b5391f
1 parent 1497592
commit 5b5391f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/packages/amazon-cognito-identity-js/android/build.gradle b/packages/amazon-cognito-identity-js/android/build.gradle
@@ -1,3 +1,8 @@
+import com.android.Version
+
+def agpVersion = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
+def androidManifestPath = agpVersion >= 7 ? 'src/main/AndroidManifest.xml' : 'src/hasNamespace/AndroidManifest.xml'
+
 buildscript {
     repositories {
         mavenCentral()
@@ -15,6 +20,10 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
+    if (agpVersion >= 7) {
+        namespace "com.amazonaws"
+    }
+
     compileSdkVersion safeExtGet('compileSdkVersion', 26)
     buildToolsVersion safeExtGet('buildToolsVersion', '26.0.3')
 
@@ -24,6 +33,11 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    sourceSets {
+        main {
+            manifest.srcFile androidManifestPath
+        }
+    }
     lintOptions {
         abortOnError false
     }

diff --git a/packages/amazon-cognito-identity-js/android/src/hasNamespace/AndroidManifest.xml b/packages/amazon-cognito-identity-js/android/src/hasNamespace/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.amazonaws">
+
+</manifest>
diff --git a/packages/amazon-cognito-identity-js/android/src/main/AndroidManifest.xml b/packages/amazon-cognito-identity-js/android/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.amazonaws">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>