chore: Upgrade to CompileSDK 34 (#2893)

aws-amplify · Aug 14, 2024 · a8a5d86 · a8a5d86
1 parent 502bbd1
commit a8a5d86
Show file tree

Hide file tree

Showing 75 changed files with 215 additions and 188 deletions.
diff --git a/.github/workflows/codecov_code_coverage.yml b/.github/workflows/codecov_code_coverage.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
 
       - name: Run test and generate kover report

diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts
@@ -24,6 +24,7 @@ apply(from = rootProject.file("configuration/publishing.gradle"))
 group = properties["POM_GROUP"].toString()
 
 android {
+    namespace = "com.amplifyframework.annotations"
     kotlinOptions {
         moduleName = "com.amplifyframework.annotations"
     }

diff --git a/annotations/src/main/AndroidManifest.xml b/annotations/src/main/AndroidManifest.xml
@@ -14,7 +14,4 @@
    permissions and limitations under the License.
 -->
 
-<manifest package="com.amplifyframework.annotations"
-        xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>
-
+<manifest />
diff --git a/aws-analytics-pinpoint/build.gradle.kts b/aws-analytics-pinpoint/build.gradle.kts
@@ -24,6 +24,10 @@ apply(from = rootProject.file("configuration/publishing.gradle"))
 
 group = properties["POM_GROUP"].toString()
 
+android {
+    namespace = "com.amplifyframework.analytics.pinpoint"
+}
+
 dependencies {
     implementation(project(":core"))
     implementation(project(":aws-core"))

diff --git a/aws-analytics-pinpoint/src/main/AndroidManifest.xml b/aws-analytics-pinpoint/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
    permissions and limitations under the License.
 -->
 
-<manifest package="com.amplifyframework.analytics.pinpoint" />
+<manifest />
diff --git a/aws-api-appsync/build.gradle.kts b/aws-api-appsync/build.gradle.kts
@@ -23,6 +23,10 @@ apply(from = rootProject.file("configuration/publishing.gradle"))
 
 group = properties["POM_GROUP"].toString()
 
+android {
+    namespace = "com.amplifyframework.appsync"
+}
+
 dependencies {
     implementation(project(":core"))
     implementation(project(":aws-core"))

diff --git a/aws-api-appsync/src/main/AndroidManifest.xml b/aws-api-appsync/src/main/AndroidManifest.xml
@@ -14,6 +14,4 @@
    permissions and limitations under the License.
 -->
 
-<manifest package="com.amplifyframework.appsync">
-</manifest>
-
+<manifest />
diff --git a/aws-api/build.gradle.kts b/aws-api/build.gradle.kts
@@ -24,7 +24,7 @@ apply(from = rootProject.file("configuration/publishing.gradle"))
 group = properties["POM_GROUP"].toString()
 
 android {
-
+    namespace = "com.amplifyframework.api.aws"
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/aws-api/src/main/AndroidManifest.xml b/aws-api/src/main/AndroidManifest.xml
@@ -14,8 +14,6 @@
    permissions and limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.amplifyframework.api.aws">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
-
diff --git a/aws-auth-cognito/build.gradle.kts b/aws-auth-cognito/build.gradle.kts
@@ -24,6 +24,10 @@ apply(from = rootProject.file("configuration/checkstyle.gradle"))
 
 group = properties["POM_GROUP"].toString()
 
+android {
+    namespace = "com.amplifyframework.auth.cognito"
+}
+
 dependencies {
     implementation(project(":core"))
     implementation(project(":aws-core"))

diff --git a/aws-auth-cognito/src/main/AndroidManifest.xml b/aws-auth-cognito/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
    permissions and limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.amplifyframework.auth.cognito">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
         <intent>

diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt
@@ -1541,10 +1541,12 @@ internal class RealAWSCognitoAuthPlugin(
                                 getUserRequest
                             )
                             val userAttributes = buildList {
-                                user?.userAttributes?.mapTo(this) {
-                                    AuthUserAttribute(
-                                        AuthUserAttributeKey.custom(it.name),
-                                        it.value
+                                user?.userAttributes?.forEach {
+                                    add(
+                                        AuthUserAttribute(
+                                            AuthUserAttributeKey.custom(it.name),
+                                            it.value
+                                        )
                                     )
                                 }
                             }

diff --git a/...h-cognito/src/test/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPluginTest.kt b/...h-cognito/src/test/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPluginTest.kt
@@ -106,6 +106,7 @@ import io.mockk.mockkConstructor
 import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import io.mockk.slot
+import io.mockk.unmockkAll
 import io.mockk.verify
 import java.util.Date
 import java.util.concurrent.CountDownLatch
@@ -116,6 +117,7 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
 import org.json.JSONObject
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
 
@@ -200,6 +202,11 @@ class RealAWSCognitoAuthPluginTest {
         )
     }
 
+    @After
+    fun teardown() {
+        unmockkAll()
+    }
+
     @Test
     fun testSignUpFailsIfNotConfigured() {
         // GIVEN

diff --git a/...nito/src/test/java/com/amplifyframework/auth/cognito/usecases/ResetPasswordUseCaseTest.kt b/...nito/src/test/java/com/amplifyframework/auth/cognito/usecases/ResetPasswordUseCaseTest.kt
@@ -46,8 +46,11 @@ import kotlinx.coroutines.test.setMain
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 @OptIn(DelicateCoroutinesApi::class, ExperimentalCoroutinesApi::class)
+@RunWith(RobolectricTestRunner::class)
 class ResetPasswordUseCaseTest {
 
     private val dummyClientId = "app client id"

diff --git a/...estsuites/fetchAuthSession/AuthSession_object_is_successfully_returned_after_refresh.json b/...estsuites/fetchAuthSession/AuthSession_object_is_successfully_returned_after_refresh.json
@@ -42,8 +42,7 @@
     },
     "api": {
         "name": "fetchAuthSession",
-        "params": {
-        },
+        "params": {},
         "options": {
             "forceRefresh": true
         }
@@ -58,10 +57,7 @@
                 "awsCredentialsResult": {
                     "accessKeyId": "someAccessKey",
                     "expiration": 2342134,
-                    "expiresAt": {
-                        "seconds": 2342134.0,
-                        "nanos": 0.0
-                    },
+                    "expiresAt": {},
                     "secretAccessKey": "someSecretKey",
                     "sessionToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VySWQiLCJ1c2VybmFtZSI6InVzZXJuYW1lIiwiZXhwIjoxNTE2MjM5MDI0LCJvcmlnaW5fanRpIjoib3JpZ2luX2p0aSJ9.po__hnGh2KF0ibpp--a2YZA9oBAKXc9BkX1IwdhvJp8"
                 },

diff --git a/...uites/fetchAuthSession/AuthSession_object_is_successfully_returned_for_Identity_Pool.json b/...uites/fetchAuthSession/AuthSession_object_is_successfully_returned_for_Identity_Pool.json
@@ -3,15 +3,12 @@
     "preConditions": {
         "amplify-configuration": "authconfiguration.json",
         "state": "SignedOut_IdentityPoolConfigured.json",
-        "mockedResponses": [
-        ]
+        "mockedResponses": []
     },
     "api": {
         "name": "fetchAuthSession",
-        "params": {
-        },
-        "options": {
-        }
+        "params": {},
+        "options": {}
     },
     "validations": [
         {
@@ -23,10 +20,7 @@
                 "awsCredentialsResult": {
                     "accessKeyId": "someAccessKey",
                     "expiration": 2342134,
-                    "expiresAt": {
-                        "seconds": 2342134.0,
-                        "nanos": 0.0
-                    },
+                    "expiresAt": {},
                     "secretAccessKey": "someSecretKey",
                     "sessionToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VySWQiLCJ1c2VybmFtZSI6InVzZXJuYW1lIiwiZXhwIjoxNTE2MjM5MDIyLCJvcmlnaW5fanRpIjoib3JpZ2luX2p0aSJ9.Xqa-vjJe5wwwsqeRAdHf8kTBn_rYSkDn2lB7xj9Z1xU"
                 },

diff --git a/...etchAuthSession/AuthSession_object_is_successfully_returned_for_UserAndIdentity_Pool.json b/...etchAuthSession/AuthSession_object_is_successfully_returned_for_UserAndIdentity_Pool.json
@@ -3,15 +3,12 @@
     "preConditions": {
         "amplify-configuration": "authconfiguration.json",
         "state": "SignedIn_SessionEstablished.json",
-        "mockedResponses": [
-        ]
+        "mockedResponses": []
     },
     "api": {
         "name": "fetchAuthSession",
-        "params": {
-        },
-        "options": {
-        }
+        "params": {},
+        "options": {}
     },
     "validations": [
         {
@@ -23,10 +20,7 @@
                 "awsCredentialsResult": {
                     "accessKeyId": "someAccessKey",
                     "expiration": 2342134,
-                    "expiresAt": {
-                        "seconds": 2342134.0,
-                        "nanos": 0.0
-                    },
+                    "expiresAt": {},
                     "secretAccessKey": "someSecretKey",
                     "sessionToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VySWQiLCJ1c2VybmFtZSI6InVzZXJuYW1lIiwiZXhwIjoxNTE2MjM5MDIyLCJvcmlnaW5fanRpIjoib3JpZ2luX2p0aSJ9.Xqa-vjJe5wwwsqeRAdHf8kTBn_rYSkDn2lB7xj9Z1xU"
                 },

diff --git a/...est/testsuites/fetchDevices/List_of_devices_returned_when_fetch_devices_API_succeeds.json b/...est/testsuites/fetchDevices/List_of_devices_returned_when_fetch_devices_API_succeeds.json
@@ -17,25 +17,10 @@
                                     "value": "value"
                                 }
                             ],
-                            "deviceCreateDate": {
-                                "value": {
-                                    "seconds": 1.688674717E9,
-                                    "nanos": 2.73132E8
-                                }
-                            },
+                            "deviceCreateDate": 1723480158,
                             "deviceKey": "deviceKey",
-                            "deviceLastAuthenticatedDate": {
-                                "value": {
-                                    "seconds": 1.688674717E9,
-                                    "nanos": 2.73136E8
-                                }
-                            },
-                            "deviceLastModifiedDate": {
-                                "value": {
-                                    "seconds": 1.688674717E9,
-                                    "nanos": 2.73137E8
-                                }
-                            }
+                            "deviceLastAuthenticatedDate": 1723480158,
+                            "deviceLastModifiedDate": 1723480158
                         }
                     ]
                 }
@@ -44,10 +29,8 @@
     },
     "api": {
         "name": "fetchDevices",
-        "params": {
-        },
-        "options": {
-        }
+        "params": {},
+        "options": {}
     },
     "validations": [
         {

diff --git a/...chDevices/Test_that_Cognito_is_called_with_given_payload_and_returns_successful_data.json b/...chDevices/Test_that_Cognito_is_called_with_given_payload_and_returns_successful_data.json
@@ -17,25 +17,10 @@
                                     "value": "value"
                                 }
                             ],
-                            "deviceCreateDate": {
-                                "value": {
-                                    "seconds": 1.688674717E9,
-                                    "nanos": 2.73132E8
-                                }
-                            },
+                            "deviceCreateDate": 1723480158,
                             "deviceKey": "deviceKey",
-                            "deviceLastAuthenticatedDate": {
-                                "value": {
-                                    "seconds": 1.688674717E9,
-                                    "nanos": 2.73136E8
-                                }
-                            },
-                            "deviceLastModifiedDate": {
-                                "value": {
-                                    "seconds": 1.688674717E9,
-                                    "nanos": 2.73137E8
-                                }
-                            }
+                            "deviceLastAuthenticatedDate": 1723480158,
+                            "deviceLastModifiedDate": 1723480158
                         }
                     ]
                 }
@@ -44,10 +29,8 @@
     },
     "api": {
         "name": "fetchDevices",
-        "params": {
-        },
-        "options": {
-        }
+        "params": {},
+        "options": {}
     },
     "validations": [
         {

diff --git a/...ut/Test_that_global_signOut_error_returns_partial_success_with_global_sign_out_error.json b/...ut/Test_that_global_signOut_error_returns_partial_success_with_global_sign_out_error.json
@@ -10,15 +10,14 @@
                 "responseType": "failure",
                 "response": {
                     "errorType": "NotAuthorizedException",
-                    "errorMessage": null
+                    "errorMessage": "Error type: Client, Protocol response: (empty response)"
                 }
             }
         ]
     },
     "api": {
         "name": "signOut",
-        "params": {
-        },
+        "params": {},
         "options": {
             "globalSignOut": true
         }
@@ -43,25 +42,16 @@
                 },
                 "hostedUIError": null,
                 "revokeTokenError": {
-                    "refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VySWQiLCJ1c2VybmFtZSI6InVzZXJuYW1lIiwiZXhwIjoxNTE2MjM5MDIyLCJvcmlnaW5fanRpIjoib3JpZ2luX2p0aSJ9.Xqa-vjJe5wwwsqeRAdHf8kTBn_rYSkDn2lB7xj9Z1xU",
                     "exception": {
+                        "errorType": "RevokeTokenException",
+                        "errorMessage": "Failed to revoke token",
                         "recoverySuggestion": "See attached exception for more details. RevokeToken can be retried using the CognitoIdentityProviderClient accessible from the escape hatch.",
-                        "detailMessage": "Failed to revoke token",
-                        "cause": {
-                            "detailMessage": "RevokeToken not attempted because GlobalSignOut failed.",
-                            "stackTrace": [
-                            ],
-                            "suppressedExceptions": [
-                            ]
-                        },
-                        "stackTrace": [
-                        ],
-                        "suppressedExceptions": [
-                        ]
-                    }
+                        "cause": {}
+                    },
+                    "refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJ1c2VySWQiLCJ1c2VybmFtZSI6InVzZXJuYW1lIiwiZXhwIjoxNTE2MjM5MDIyLCJvcmlnaW5fanRpIjoib3JpZ2luX2p0aSJ9.Xqa-vjJe5wwwsqeRAdHf8kTBn_rYSkDn2lB7xj9Z1xU"
                 },
                 "signedOutLocally": true
             }
         }
     ]
-}
+}
diff --git a/aws-auth-plugins-core/build.gradle.kts b/aws-auth-plugins-core/build.gradle.kts
@@ -25,6 +25,7 @@ apply(from = rootProject.file("configuration/publishing.gradle"))
 group = properties["POM_GROUP"].toString()
 
 android {
+    namespace = "com.amplifyframework.plugins.core"
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }

diff --git a/aws-auth-plugins-core/src/main/AndroidManifest.xml b/aws-auth-plugins-core/src/main/AndroidManifest.xml
@@ -14,6 +14,4 @@
    permissions and limitations under the License.
 -->
 
-<manifest package="com.amplifyframework.plugins.core"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-</manifest>
+<manifest />