fix(repo): AGP 8.0 compatibility

Fixes #2937 Adds `namespace` attribute to `build.gradle` files in accordance with [Android docs](https://developer.android.com/build/publish-library/prep-lib-release) for compatibility with Android Gradle Plugin (AGP) 8.0. See also: flutter/flutter#125181 (comment)
aws-amplify · Apr 26, 2023 · 8aa5404 · 8aa5404
1 parent 8984d93
commit 8aa5404
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 26 deletions.
diff --git a/packages/amplify/amplify_flutter_android/android/build.gradle b/packages/amplify/amplify_flutter_android/android/build.gradle
@@ -61,6 +61,8 @@ android {
             includeAndroidResources = true
         }
     }
+
+    namespace 'com.amazonaws.amplify.amplify'
 }
 
 dependencies {

diff --git a/packages/amplify/amplify_flutter_android/android/src/main/AndroidManifest.xml b/packages/amplify/amplify_flutter_android/android/src/main/AndroidManifest.xml
@@ -1,2 +1,3 @@
-<manifest package="com.amazonaws.amplify.amplify">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.amazonaws.amplify.amplify">
 </manifest>
diff --git a/packages/amplify_datastore/android/build.gradle b/packages/amplify_datastore/android/build.gradle
@@ -67,6 +67,8 @@ android {
             includeAndroidResources = true
         }
     }
+
+    namespace 'com.amazonaws.amplify.amplify_datastore'
 }
 
 dependencies {

diff --git a/packages/amplify_native_legacy_wrapper/android/build.gradle b/packages/amplify_native_legacy_wrapper/android/build.gradle
@@ -43,6 +43,8 @@ android {
     defaultConfig {
         minSdkVersion 16
     }
+
+    namespace 'com.amazonaws.amplify.amplify_native_legacy_wrapper'
 }
 dependencies {
     implementation 'com.amazonaws:aws-android-sdk-mobile-client:2.65.0'

diff --git a/packages/analytics/amplify_analytics_pinpoint/android/build.gradle b/packages/analytics/amplify_analytics_pinpoint/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint'
+group 'com.amazonaws.amplify.amplify_analytics_pinpoint'
 version '1.0-SNAPSHOT'
 
 buildscript {
@@ -43,6 +43,8 @@ android {
     defaultConfig {
         minSdkVersion 23
     }
+
+    namespace 'com.amazonaws.amplify.amplify_analytics_pinpoint'
 }
 
 dependencies {

diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/AndroidManifest.xml b/packages/analytics/amplify_analytics_pinpoint/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint">
+    package="com.amazonaws.amplify.amplify_analytics_pinpoint">
 </manifest>
diff --git a/.../amplify_analytics_pinpoint/Messages.java → .../amplify_analytics_pinpoint/Messages.java b/.../amplify_analytics_pinpoint/Messages.java → .../amplify_analytics_pinpoint/Messages.java
diff --git a/...inpoint/AmplifyAnalyticsPinpointPlugin.kt → ...inpoint/AmplifyAnalyticsPinpointPlugin.kt b/...inpoint/AmplifyAnalyticsPinpointPlugin.kt → ...inpoint/AmplifyAnalyticsPinpointPlugin.kt
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint
+package com.amazonaws.amplify.amplify_analytics_pinpoint
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -39,4 +39,4 @@ class AmplifyAnalyticsPinpointPlugin: FlutterPlugin, Messages.PigeonLegacyDataPr
         result.success(sharedPrefs!!.getString(UNIQUE_ID_KEY, null))
     }
 
-}
+}
diff --git a/...s_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart b/...s_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
diff --git a/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart b/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart
@@ -10,11 +10,10 @@ import 'package:pigeon/pigeon.dart';
     dartOut:
         'lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart',
     javaOut:
-        'android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java',
+        'android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java',
     javaOptions: JavaOptions(
       className: 'Messages',
-      package:
-          'com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint',
+      package: 'com.amazonaws.amplify.amplify_analytics_pinpoint',
     ),
     copyrightHeader: 'pigeons/copyright.txt',
   ),

diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
@@ -41,5 +41,5 @@ flutter:
   plugin:
     platforms:
       android:
-        package: com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint
+        package: com.amazonaws.amplify.amplify_analytics_pinpoint
         pluginClass: AmplifyAnalyticsPinpointPlugin
diff --git a/packages/api/amplify_api_android/android/build.gradle b/packages/api/amplify_api_android/android/build.gradle
@@ -64,6 +64,8 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+
+    namespace 'com.amazonaws.amplify.amplify_api'
 }
 
 dependencies {

diff --git a/packages/auth/amplify_auth_cognito_android/android/build.gradle b/packages/auth/amplify_auth_cognito_android/android/build.gradle
@@ -65,6 +65,8 @@ android {
             returnDefaultValues = true
         }
     }
+
+    namespace 'com.amazonaws.amplify.amplify_auth_cognito'
 }
 
 dependencies {

diff --git a/packages/common/amplify_db_common/android/build.gradle b/packages/common/amplify_db_common/android/build.gradle
@@ -43,6 +43,8 @@ android {
     defaultConfig {
         minSdkVersion 16
     }
+
+    namespace 'com.amazonaws.amplify.amplify_db_common'
 }
 
 dependencies {

diff --git a/packages/notifications/push/amplify_push_notifications/android/build.gradle b/packages/notifications/push/amplify_push_notifications/android/build.gradle
@@ -58,6 +58,8 @@ android {
             includeAndroidResources = true
         }
     }
+
+    namespace 'com.amazonaws.amplify.amplify_push_notifications'
 }
 
 // Logic for finding sibling plugins, from `flutter_tools/gradle/flutter.gradle`

diff --git a/packages/secure_storage/amplify_secure_storage/android/build.gradle b/packages/secure_storage/amplify_secure_storage/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage'
+group 'com.amazonaws.amplify.amplify_secure_storage'
 version '1.0-SNAPSHOT'
 
 buildscript {
@@ -45,6 +45,8 @@ android {
     }
 
     testOptions.unitTests.includeAndroidResources = true
+
+    namespace 'com.amazonaws.amplify.amplify_secure_storage'
 }
 
 dependencies {

diff --git a/packages/secure_storage/amplify_secure_storage/android/src/main/AndroidManifest.xml b/packages/secure_storage/amplify_secure_storage/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage">
+  package="com.amazonaws.amplify.amplify_secure_storage">
 </manifest>
diff --git a/...rage/amplify_secure_storage/Messages.java → ...lify/amplify_secure_storage/Messages.java b/...rage/amplify_secure_storage/Messages.java → ...lify/amplify_secure_storage/Messages.java
diff --git a/...ure_storage/AmplifySecureStoragePlugin.kt → ...ure_storage/AmplifySecureStoragePlugin.kt b/...ure_storage/AmplifySecureStoragePlugin.kt → ...ure_storage/AmplifySecureStoragePlugin.kt
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
+package com.amazonaws.amplify.amplify_secure_storage
 
 import android.content.Context
 

diff --git a/...re_storage/EncryptedKeyValueRepository.kt → ...re_storage/EncryptedKeyValueRepository.kt b/...re_storage/EncryptedKeyValueRepository.kt → ...re_storage/EncryptedKeyValueRepository.kt
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
+package com.amazonaws.amplify.amplify_secure_storage
 
 import android.content.Context
 import android.content.SharedPreferences

diff --git a/...lify_secure_storage/KeyValueRepository.kt → ...lify_secure_storage/KeyValueRepository.kt b/...lify_secure_storage/KeyValueRepository.kt → ...lify_secure_storage/KeyValueRepository.kt
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
+package com.amazonaws.amplify.amplify_secure_storage
 
 interface KeyValueRepository {
     fun put(dataKey: String, value: String?)

diff --git a/...torage/EncryptedKeyValueRepositoryTest.kt → ...torage/EncryptedKeyValueRepositoryTest.kt b/...torage/EncryptedKeyValueRepositoryTest.kt → ...torage/EncryptedKeyValueRepositoryTest.kt
@@ -1,4 +1,7 @@
-package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazonaws.amplify.amplify_secure_storage
 
 import android.content.Context
 import android.content.Context.MODE_PRIVATE
@@ -77,4 +80,4 @@ class TestEncryptedKeyValueRepository(
     override fun removeSharedPreferencesFile() {
         context.getSharedPreferences("test", MODE_PRIVATE).edit().clear().commit()
     }
-}
+}
diff --git a/...ify_secure_storage/FakeAndroidKeyStore.kt → ...ify_secure_storage/FakeAndroidKeyStore.kt b/...ify_secure_storage/FakeAndroidKeyStore.kt → ...ify_secure_storage/FakeAndroidKeyStore.kt
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
+package com.amazonaws.amplify.amplify_secure_storage
 
 import java.io.InputStream
 import java.io.OutputStream
@@ -67,4 +67,4 @@ object FakeAndroidKeyStore {
         override fun engineInit(keysize: Int, random: SecureRandom?) = Unit
         override fun engineGenerateKey(): SecretKey = wrapped.generateKey()
     }
-}
+}
diff --git a/packages/secure_storage/amplify_secure_storage/pigeons/messages.android.dart b/packages/secure_storage/amplify_secure_storage/pigeons/messages.android.dart
@@ -9,11 +9,10 @@ import 'package:pigeon/pigeon.dart';
   PigeonOptions(
     dartOut: 'lib/src/messages.android.g.dart',
     javaOut:
-        'android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/Messages.java',
+        'android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/Messages.java',
     javaOptions: JavaOptions(
       className: 'Messages',
-      package:
-          'com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage',
+      package: 'com.amazonaws.amplify.amplify_secure_storage',
     ),
     copyrightHeader: 'pigeons/copyright.txt',
   ),

diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml
@@ -30,7 +30,7 @@ flutter:
   plugin:
     platforms:
       android:
-        package: com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage
+        package: com.amazonaws.amplify.amplify_secure_storage
         pluginClass: AmplifySecureStoragePlugin
       ios:
         pluginClass: AmplifySecureStoragePlugin