From 8aa5404cdc041067d20289d889c2972c6d923f45 Mon Sep 17 00:00:00 2001
From: Dillon Nys <nydillon@amazon.com>
Date: Wed, 26 Apr 2023 09:28:48 -0700
Subject: [PATCH] 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: https://github.com/flutter/flutter/issues/125181#issuecomment-1516647803
---
 .../amplify/amplify_flutter_android/android/build.gradle   | 2 ++
 .../android/src/main/AndroidManifest.xml                   | 3 ++-
 packages/amplify_datastore/android/build.gradle            | 2 ++
 .../amplify_native_legacy_wrapper/android/build.gradle     | 2 ++
 .../amplify_analytics_pinpoint/android/build.gradle        | 4 +++-
 .../android/src/main/AndroidManifest.xml                   | 2 +-
 .../{amplify_analytics_pinpoint => }/Messages.java         | 4 ++--
 .../AmplifyAnalyticsPinpointPlugin.kt                      | 4 ++--
 .../pigeon_legacy_data_provider.android.g.dart             | 2 +-
 .../pigeons/pigeon_config_android.dart                     | 5 ++---
 packages/analytics/amplify_analytics_pinpoint/pubspec.yaml | 2 +-
 packages/api/amplify_api_android/android/build.gradle      | 2 ++
 .../auth/amplify_auth_cognito_android/android/build.gradle | 2 ++
 packages/common/amplify_db_common/android/build.gradle     | 2 ++
 .../push/amplify_push_notifications/android/build.gradle   | 2 ++
 .../amplify_secure_storage/android/build.gradle            | 4 +++-
 .../android/src/main/AndroidManifest.xml                   | 2 +-
 .../{amplify_secure_storage => }/Messages.java             | 2 +-
 .../AmplifySecureStoragePlugin.kt                          | 2 +-
 .../EncryptedKeyValueRepository.kt                         | 2 +-
 .../{amplify_secure_storage => }/KeyValueRepository.kt     | 2 +-
 .../EncryptedKeyValueRepositoryTest.kt                     | 7 +++++--
 .../{amplify_secure_storage => }/FakeAndroidKeyStore.kt    | 4 ++--
 .../amplify_secure_storage/pigeons/messages.android.dart   | 5 ++---
 .../secure_storage/amplify_secure_storage/pubspec.yaml     | 2 +-
 25 files changed, 46 insertions(+), 26 deletions(-)
 rename packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/{amplify_analytics_pinpoint => }/Messages.java (96%)
 rename packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/{amplify_analytics_pinpoint => }/AmplifyAnalyticsPinpointPlugin.kt (94%)
 rename packages/secure_storage/amplify_secure_storage/android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/{amplify_secure_storage => }/Messages.java (99%)
 rename packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/{amplify_secure_storage => }/AmplifySecureStoragePlugin.kt (96%)
 rename packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/{amplify_secure_storage => }/EncryptedKeyValueRepository.kt (96%)
 rename packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/{amplify_secure_storage => }/KeyValueRepository.kt (78%)
 rename packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/{amplify_secure_storage => }/EncryptedKeyValueRepositoryTest.kt (93%)
 rename packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/{amplify_secure_storage => }/FakeAndroidKeyStore.kt (97%)

diff --git a/packages/amplify/amplify_flutter_android/android/build.gradle b/packages/amplify/amplify_flutter_android/android/build.gradle
index f669ebb0b2..11f8d28f84 100644
--- 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
index 37a493e2cf..dbd66789e3 100644
--- 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
index e04952985f..38a0c9518e 100644
--- 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
index f5946f0fb4..604fa41432 100644
--- 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
index 2755996484..c649bfbe13 100644
--- 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
index 178b72183e..eb88316739 100644
--- 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/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java
similarity index 96%
rename from packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java
rename to packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java
index ce7ed6b029..904570c960 100644
--- a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/Messages.java
+++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java
@@ -1,9 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v9.2.4), do not edit directly.
+// Autogenerated from Pigeon (v9.2.5), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
-package com.amazonaws.amplify.amplify_analytics_pinpoint.amplify_analytics_pinpoint;
+package com.amazonaws.amplify.amplify_analytics_pinpoint;
 
 import android.util.Log;
 import androidx.annotation.NonNull;
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt b/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt
similarity index 94%
rename from packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt
rename to packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt
index e3110ed0f5..d1068b90c2 100644
--- a/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/amplify_analytics_pinpoint/AmplifyAnalyticsPinpointPlugin.kt
+++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/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))
     }
 
-}
\ No newline at end of file
+}
diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
index 97464f62d0..2ce5f08437 100644
--- a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
+++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v9.2.4), do not edit directly.
+// Autogenerated from Pigeon (v9.2.5), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 
diff --git a/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart b/packages/analytics/amplify_analytics_pinpoint/pigeons/pigeon_config_android.dart
index f7cc9baf58..52426d6e6c 100644
--- 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
index 7b05b1172b..1403d62c56 100644
--- 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
index a2d9c555be..c64c2c430d 100644
--- 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
index 16dd13bb45..6dbce6c1d0 100644
--- 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
index a196b4105a..aaafe8cc67 100644
--- 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
index 9ba40d452e..cecbb3c8e2 100644
--- 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
index a24a08695e..fc1615b7d8 100644
--- 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
index ea7268a690..61475934af 100644
--- 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/packages/secure_storage/amplify_secure_storage/android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/Messages.java b/packages/secure_storage/amplify_secure_storage/android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/Messages.java
similarity index 99%
rename from packages/secure_storage/amplify_secure_storage/android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/Messages.java
rename to packages/secure_storage/amplify_secure_storage/android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/Messages.java
index cc1bed0e1a..00367246c2 100644
--- a/packages/secure_storage/amplify_secure_storage/android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/Messages.java
+++ b/packages/secure_storage/amplify_secure_storage/android/src/main/java/com/amazonaws/amplify/amplify_secure_storage/Messages.java
@@ -4,7 +4,7 @@
 // Autogenerated from Pigeon (v9.2.4), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
-package com.amazonaws.amplify.amplify_secure_storage.amplify_secure_storage;
+package com.amazonaws.amplify.amplify_secure_storage;
 
 import android.util.Log;
 import androidx.annotation.NonNull;
diff --git a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/AmplifySecureStoragePlugin.kt b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/AmplifySecureStoragePlugin.kt
similarity index 96%
rename from packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/AmplifySecureStoragePlugin.kt
rename to packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/AmplifySecureStoragePlugin.kt
index b175f48291..b36af83368 100644
--- a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/AmplifySecureStoragePlugin.kt
+++ b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_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/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/EncryptedKeyValueRepository.kt b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/EncryptedKeyValueRepository.kt
similarity index 96%
rename from packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/EncryptedKeyValueRepository.kt
rename to packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/EncryptedKeyValueRepository.kt
index b0d671abfd..f1c7c6d7f1 100644
--- a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/EncryptedKeyValueRepository.kt
+++ b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_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/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/KeyValueRepository.kt b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/KeyValueRepository.kt
similarity index 78%
rename from packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/KeyValueRepository.kt
rename to packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/KeyValueRepository.kt
index 99ac63a248..7335ebef84 100644
--- a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/KeyValueRepository.kt
+++ b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_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/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/EncryptedKeyValueRepositoryTest.kt b/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/EncryptedKeyValueRepositoryTest.kt
similarity index 93%
rename from packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/EncryptedKeyValueRepositoryTest.kt
rename to packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/EncryptedKeyValueRepositoryTest.kt
index 5d4293ff6a..24cc5a06ca 100644
--- a/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/EncryptedKeyValueRepositoryTest.kt
+++ b/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/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()
     }
-}
\ No newline at end of file
+}
diff --git a/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/FakeAndroidKeyStore.kt b/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/FakeAndroidKeyStore.kt
similarity index 97%
rename from packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/FakeAndroidKeyStore.kt
rename to packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/FakeAndroidKeyStore.kt
index 1feecaa906..9a6a784839 100644
--- a/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_secure_storage/amplify_secure_storage/FakeAndroidKeyStore.kt
+++ b/packages/secure_storage/amplify_secure_storage/android/src/test/kotlin/com/amazonaws/amplify/amplify_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()
     }
-}
\ No newline at end of file
+}
diff --git a/packages/secure_storage/amplify_secure_storage/pigeons/messages.android.dart b/packages/secure_storage/amplify_secure_storage/pigeons/messages.android.dart
index 495d882b25..ae8c674c0e 100644
--- 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
index 266acc9423..c133fdb35b 100644
--- 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