diff --git a/.github/workflows/codecov_code_coverage.yml b/.github/workflows/codecov_code_coverage.yml
index 515284cdab..64263d90b0 100644
--- 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@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'corretto'
 
       - name: Run test and generate jacoco report
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index ac5602a728..c5228ec6af 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index bb3923b2db..42cc79e213 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -131,6 +131,9 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="0" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
diff --git a/aws-analytics-pinpoint/src/test/java/com/amplifyframework/analytics/pinpoint/models/PinpointEventTest.kt b/aws-analytics-pinpoint/src/test/java/com/amplifyframework/analytics/pinpoint/models/PinpointEventTest.kt
index 6a8c5dc1da..8dc8a890bc 100644
--- a/aws-analytics-pinpoint/src/test/java/com/amplifyframework/analytics/pinpoint/models/PinpointEventTest.kt
+++ b/aws-analytics-pinpoint/src/test/java/com/amplifyframework/analytics/pinpoint/models/PinpointEventTest.kt
@@ -14,6 +14,7 @@
  */
 package com.amplifyframework.analytics.pinpoint.models
 
+import java.util.Locale
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
@@ -41,7 +42,7 @@ class PinpointEventTest {
             eventTimestamp = 1657035956917L,
             uniqueId = "UNIQUE_ID",
             androidAppDetails = AndroidAppDetails("appId", "appTitle", "packageName", "versionCode", "versionName"),
-            androidDeviceDetails = AndroidDeviceDetails()
+            androidDeviceDetails = AndroidDeviceDetails(locale = Locale.US)
         )
         assertEquals(expectedOutput, pinpointEvent.toJsonString())
     }
@@ -58,7 +59,7 @@ class PinpointEventTest {
             eventTimestamp = 1657035956917L,
             uniqueId = "UNIQUE_ID",
             androidAppDetails = AndroidAppDetails("appId", "appTitle", "packageName", "versionCode", "versionName"),
-            androidDeviceDetails = AndroidDeviceDetails()
+            androidDeviceDetails = AndroidDeviceDetails(locale = Locale.US)
         )
 
         val pinpointEventJson =
diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/KotlinAuthFacadeInternal.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/KotlinAuthFacadeInternal.kt
index 2b05e9c321..ca4b4dc456 100644
--- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/KotlinAuthFacadeInternal.kt
+++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/KotlinAuthFacadeInternal.kt
@@ -181,34 +181,32 @@ internal class KotlinAuthFacadeInternal(private val delegate: RealAWSCognitoAuth
     suspend fun signInWithSocialWebUI(
         provider: AuthProvider,
         callingActivity: Activity
-    ):
-        AuthSignInResult {
-            return suspendCoroutine { continuation ->
-                delegate.signInWithSocialWebUI(
-                    provider,
-                    callingActivity,
-                    { continuation.resume(it) },
-                    { continuation.resumeWithException(it) }
-                )
-            }
+    ): AuthSignInResult {
+        return suspendCoroutine { continuation ->
+            delegate.signInWithSocialWebUI(
+                provider,
+                callingActivity,
+                { continuation.resume(it) },
+                { continuation.resumeWithException(it) }
+            )
         }
+    }
 
     suspend fun signInWithSocialWebUI(
         provider: AuthProvider,
         callingActivity: Activity,
         options: AuthWebUISignInOptions
-    ):
-        AuthSignInResult {
-            return suspendCoroutine { continuation ->
-                delegate.signInWithSocialWebUI(
-                    provider,
-                    callingActivity,
-                    options,
-                    { continuation.resume(it) },
-                    { continuation.resumeWithException(it) }
-                )
-            }
+    ): AuthSignInResult {
+        return suspendCoroutine { continuation ->
+            delegate.signInWithSocialWebUI(
+                provider,
+                callingActivity,
+                options,
+                { continuation.resume(it) },
+                { continuation.resumeWithException(it) }
+            )
         }
+    }
 
     suspend fun signInWithWebUI(
         callingActivity: Activity
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
index cc4da10521..81350e123a 100644
--- 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
@@ -519,8 +519,8 @@ internal class RealAWSCognitoAuthPlugin(
                             }
                         }
                     }
-                    authNState is AuthenticationState.SignedIn
-                        && authZState is AuthorizationState.SessionEstablished -> {
+                    authNState is AuthenticationState.SignedIn &&
+                        authZState is AuthorizationState.SessionEstablished -> {
                         authStateMachine.cancel(token)
                         val authSignInResult = AuthSignInResult(
                             true,
@@ -594,8 +594,8 @@ internal class RealAWSCognitoAuthPlugin(
                 val signInState = (authNState as? AuthenticationState.SigningIn)?.signInState
                 val challengeState = (signInState as? SignInState.ResolvingChallenge)?.challengeState
                 when {
-                    authNState is AuthenticationState.SignedIn
-                        && authZState is AuthorizationState.SessionEstablished -> {
+                    authNState is AuthenticationState.SignedIn &&
+                        authZState is AuthorizationState.SessionEstablished -> {
                         authStateMachine.cancel(token)
                         val authSignInResult = AuthSignInResult(
                             true,
@@ -740,8 +740,8 @@ internal class RealAWSCognitoAuthPlugin(
                             authStateMachine.send(AuthenticationEvent(AuthenticationEvent.EventType.CancelSignIn()))
                         }
                     }
-                    authNState is AuthenticationState.SignedIn
-                        && authZState is AuthorizationState.SessionEstablished -> {
+                    authNState is AuthenticationState.SignedIn &&
+                        authZState is AuthorizationState.SessionEstablished -> {
                         authStateMachine.cancel(token)
                         val authSignInResult =
                             AuthSignInResult(
@@ -1798,8 +1798,8 @@ internal class RealAWSCognitoAuthPlugin(
                 val authNState = authState.authNState
                 val authZState = authState.authZState
                 when {
-                    authNState is AuthenticationState.FederatedToIdentityPool
-                        && authZState is AuthorizationState.SessionEstablished -> {
+                    authNState is AuthenticationState.FederatedToIdentityPool &&
+                        authZState is AuthorizationState.SessionEstablished -> {
                         authStateMachine.cancel(token)
                         val credential = authZState.amplifyCredential as? AmplifyCredential.IdentityPoolFederated
                         val identityId = credential?.identityId
@@ -1853,12 +1853,11 @@ internal class RealAWSCognitoAuthPlugin(
                     (
                         authNState is AuthenticationState.FederatedToIdentityPool &&
                             authZState is AuthorizationState.SessionEstablished
-                        ) ||
-                    (
-                        authZState is AuthorizationState.Error &&
-                            authZState.exception is SessionError &&
-                            authZState.exception.amplifyCredential is AmplifyCredential.IdentityPoolFederated
-                        ) -> {
+                        ) || (
+                    authZState is AuthorizationState.Error &&
+                        authZState.exception is SessionError &&
+                        authZState.exception.amplifyCredential is AmplifyCredential.IdentityPoolFederated
+                    ) -> {
                     val event = AuthenticationEvent(AuthenticationEvent.EventType.ClearFederationToIdentityPool())
                     authStateMachine.send(event)
                     _clearFederationToIdentityPool(onSuccess, onError)
diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/HostedUIHttpHelper.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/HostedUIHttpHelper.kt
index 7ba050a427..e6a6309895 100644
--- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/HostedUIHttpHelper.kt
+++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/HostedUIHttpHelper.kt
@@ -27,7 +27,6 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.net.URLEncoder
 import javax.net.ssl.HttpsURLConnection
-import kotlin.jvm.Throws
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -39,39 +38,42 @@ internal object HostedUIHttpHelper {
     private val json = Json { ignoreUnknownKeys = true }
 
     @Throws(Exception::class)
-    fun fetchTokens(url: URL, headerParams: Map<String, String>, bodyParams: Map<String, String>):
-        CognitoUserPoolTokens {
-            val connection = (url.openConnection() as HttpsURLConnection).apply {
-                requestMethod = "POST"
-                doOutput = true
-                // add headers
-                headerParams.map { addRequestProperty(it.key, it.value) }
-                // add body
-                DataOutputStream(outputStream).use { dos ->
-                    val requestBody = bodyParams.map {
-                        "${URLEncoder.encode(it.key, "UTF-8")}=${URLEncoder.encode(it.value, "UTF-8")}"
-                    }.joinToString("&")
-                    dos.writeBytes(requestBody)
-                }
+    fun fetchTokens(
+        url: URL,
+        headerParams: Map<String, String>,
+        bodyParams: Map<String, String>
+    ): CognitoUserPoolTokens {
+        val connection = (url.openConnection() as HttpsURLConnection).apply {
+            requestMethod = "POST"
+            doOutput = true
+            // add headers
+            headerParams.map { addRequestProperty(it.key, it.value) }
+            // add body
+            DataOutputStream(outputStream).use { dos ->
+                val requestBody = bodyParams.map {
+                    "${URLEncoder.encode(it.key, "UTF-8")}=${URLEncoder.encode(it.value, "UTF-8")}"
+                }.joinToString("&")
+                dos.writeBytes(requestBody)
             }
+        }
 
-            val responseCode = connection.responseCode
+        val responseCode = connection.responseCode
 
-            if (responseCode >= HttpURLConnection.HTTP_OK && responseCode < HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                val responseStream = if (responseCode < HttpURLConnection.HTTP_MULT_CHOICE) {
-                    connection.inputStream
-                } else {
-                    connection.errorStream
-                }
-                val responseString = responseStream.bufferedReader().use(BufferedReader::readText)
-                return parseTokenResponse(responseString)
+        if (responseCode >= HttpURLConnection.HTTP_OK && responseCode < HttpURLConnection.HTTP_INTERNAL_ERROR) {
+            val responseStream = if (responseCode < HttpURLConnection.HTTP_MULT_CHOICE) {
+                connection.inputStream
             } else {
-                throw ServiceException(
-                    message = connection.responseMessage,
-                    recoverySuggestion = AmplifyException.TODO_RECOVERY_SUGGESTION
-                )
+                connection.errorStream
             }
+            val responseString = responseStream.bufferedReader().use(BufferedReader::readText)
+            return parseTokenResponse(responseString)
+        } else {
+            throw ServiceException(
+                message = connection.responseMessage,
+                recoverySuggestion = AmplifyException.TODO_RECOVERY_SUGGESTION
+            )
         }
+    }
 
     private fun parseTokenResponse(responseString: String): CognitoUserPoolTokens {
 
diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/SignInChallengeHelper.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/SignInChallengeHelper.kt
index f7a4e81bdd..82bd1d7d16 100644
--- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/SignInChallengeHelper.kt
+++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/SignInChallengeHelper.kt
@@ -77,8 +77,8 @@ internal object SignInChallengeHelper {
                 }
             }
             challengeNameType is ChallengeNameType.SmsMfa ||
-                challengeNameType is ChallengeNameType.CustomChallenge
-                || challengeNameType is ChallengeNameType.NewPasswordRequired -> {
+                challengeNameType is ChallengeNameType.CustomChallenge ||
+                challengeNameType is ChallengeNameType.NewPasswordRequired -> {
                 val challenge =
                     AuthChallenge(challengeNameType.value, username, session, challengeParameters)
                 SignInEvent(SignInEvent.EventType.ReceivedChallenge(challenge))
diff --git a/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt b/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt
index 0e5b26c405..6a29dee42a 100644
--- a/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt
+++ b/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/featuretest/generators/testcasegenerators/SignUpTestCaseGenerator.kt
@@ -86,20 +86,19 @@ object SignUpTestCaseGenerator : SerializableProvider {
             ExpectationShapes.Amplify(
                 apiName = AuthAPI.signUp,
                 responseType = ResponseType.Success,
-                response =
-                    AuthSignUpResult(
-                        false,
-                        AuthNextSignUpStep(
-                            AuthSignUpStep.CONFIRM_SIGN_UP_STEP,
-                            emptyMap(),
-                            AuthCodeDeliveryDetails(
-                                email,
-                                AuthCodeDeliveryDetails.DeliveryMedium.EMAIL,
-                                "attributeName"
-                            )
-                        ),
-                        null
-                    ).toJsonElement()
+                response = AuthSignUpResult(
+                    false,
+                    AuthNextSignUpStep(
+                        AuthSignUpStep.CONFIRM_SIGN_UP_STEP,
+                        emptyMap(),
+                        AuthCodeDeliveryDetails(
+                            email,
+                            AuthCodeDeliveryDetails.DeliveryMedium.EMAIL,
+                            "attributeName"
+                        )
+                    ),
+                    null
+                ).toJsonElement()
             )
         )
     )
@@ -131,15 +130,15 @@ object SignUpTestCaseGenerator : SerializableProvider {
                 apiName = AuthAPI.signUp,
                 responseType = ResponseType.Success,
                 response =
-                    AuthSignUpResult(
-                        true,
-                        AuthNextSignUpStep(
-                            AuthSignUpStep.DONE,
-                            emptyMap(),
-                            null
-                        ),
+                AuthSignUpResult(
+                    true,
+                    AuthNextSignUpStep(
+                        AuthSignUpStep.DONE,
+                        emptyMap(),
                         null
-                    ).toJsonElement()
+                    ),
+                    null
+                ).toJsonElement()
             )
         )
     )
diff --git a/aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/configuration/AWSS3StoragePluginConfiguration.kt b/aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/configuration/AWSS3StoragePluginConfiguration.kt
index 16b1fc6d30..bcf23a73ff 100644
--- a/aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/configuration/AWSS3StoragePluginConfiguration.kt
+++ b/aws-storage-s3/src/main/java/com/amplifyframework/storage/s3/configuration/AWSS3StoragePluginConfiguration.kt
@@ -28,12 +28,11 @@ class AWSS3StoragePluginConfiguration private constructor(builder: Builder) {
                 .build()
     }
 
-    fun getAWSS3PluginPrefixResolver(authCredentialsProvider: AuthCredentialsProvider):
-        AWSS3PluginPrefixResolver {
-            return awsS3PluginPrefixResolver ?: StorageAccessLevelAwarePrefixResolver(
-                authCredentialsProvider
-            )
-        }
+    fun getAWSS3PluginPrefixResolver(authCredentialsProvider: AuthCredentialsProvider): AWSS3PluginPrefixResolver {
+        return awsS3PluginPrefixResolver ?: StorageAccessLevelAwarePrefixResolver(
+            authCredentialsProvider
+        )
+    }
 
     class Builder {
         var awsS3PluginPrefixResolver: AWSS3PluginPrefixResolver? = null
diff --git a/build.gradle b/build.gradle
index ed0f3db6fd..cb297c36b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
-        classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.4.1'
+        classpath 'org.jlleitschuh.gradle:ktlint-gradle:11.0.0'
         classpath "org.gradle:test-retry-gradle-plugin:1.4.1"
     }
 }
@@ -66,7 +66,7 @@ task clean(type: Delete) {
 
 ext {
     buildToolsVersion = "30.0.2"
-    compileSdkVersion = 30
+    compileSdkVersion = 31
     minSdkVersion = 24
     targetSdkVersion = 30
     awsKotlinSdkVersion = '0.17.12-beta'
@@ -74,7 +74,7 @@ ext {
     navigationVersion = '2.3.4'
     dependency = [
         android: [
-            desugartools: 'com.android.tools:desugar_jdk_libs:1.0.9',
+            desugartools: 'com.android.tools:desugar_jdk_libs:1.2.0',
         ],
         androidx: [
             v4support: 'androidx.legacy:legacy-support-v4:1.0.0',
@@ -153,7 +153,7 @@ ext {
         mockkandroid: 'io.mockk:mockk-android:1.12.3',
         mockwebserver: 'com.squareup.okhttp3:mockwebserver:5.0.0-alpha.9',
         mockitoinline: 'org.mockito:mockito-inline:3.11.2',
-        robolectric: 'org.robolectric:robolectric:4.5.1',
+        robolectric: 'org.robolectric:robolectric:4.7',
         jsonassert: 'org.skyscreamer:jsonassert:1.5.0'
     ]
 }
@@ -224,6 +224,8 @@ private void configureAndroidLibrary(Project project) {
                     includeAndroidResources = true
                 }
             }
+
+            buildConfigField "String", "VERSION_NAME", "\"${project.ext.VERSION_NAME}\""
         }
 
         lintOptions {
diff --git a/core-kotlin/src/main/java/com/amplifyframework/kotlin/api/KotlinApiFacade.kt b/core-kotlin/src/main/java/com/amplifyframework/kotlin/api/KotlinApiFacade.kt
index 9a4a19d833..722b9fd769 100644
--- a/core-kotlin/src/main/java/com/amplifyframework/kotlin/api/KotlinApiFacade.kt
+++ b/core-kotlin/src/main/java/com/amplifyframework/kotlin/api/KotlinApiFacade.kt
@@ -42,46 +42,46 @@ class KotlinApiFacade(private val delegate: Delegate = Amplify.API) : Api {
     @Throws(ApiException::class)
     override suspend fun <R> query(request: GraphQLRequest<R>, apiName: String?):
         GraphQLResponse<R> {
-            return suspendCancellableCoroutine { continuation ->
-                val operation = if (apiName != null) {
-                    delegate.query(
-                        apiName,
-                        request,
-                        { continuation.resume(it) },
-                        { continuation.resumeWithException(it) }
-                    )
-                } else {
-                    delegate.query(
-                        request,
-                        { continuation.resume(it) },
-                        { continuation.resumeWithException(it) }
-                    )
-                }
-                continuation.invokeOnCancellation { operation?.cancel() }
+        return suspendCancellableCoroutine { continuation ->
+            val operation = if (apiName != null) {
+                delegate.query(
+                    apiName,
+                    request,
+                    { continuation.resume(it) },
+                    { continuation.resumeWithException(it) }
+                )
+            } else {
+                delegate.query(
+                    request,
+                    { continuation.resume(it) },
+                    { continuation.resumeWithException(it) }
+                )
             }
+            continuation.invokeOnCancellation { operation?.cancel() }
         }
+    }
 
     @Throws(ApiException::class)
     override suspend fun <T> mutate(request: GraphQLRequest<T>, apiName: String?):
         GraphQLResponse<T> {
-            return suspendCancellableCoroutine { continuation ->
-                val operation = if (apiName != null) {
-                    delegate.mutate(
-                        apiName,
-                        request,
-                        { continuation.resume(it) },
-                        { continuation.resumeWithException(it) }
-                    )
-                } else {
-                    delegate.mutate(
-                        request,
-                        { continuation.resume(it) },
-                        { continuation.resumeWithException(it) }
-                    )
-                }
-                continuation.invokeOnCancellation { operation?.cancel() }
+        return suspendCancellableCoroutine { continuation ->
+            val operation = if (apiName != null) {
+                delegate.mutate(
+                    apiName,
+                    request,
+                    { continuation.resume(it) },
+                    { continuation.resumeWithException(it) }
+                )
+            } else {
+                delegate.mutate(
+                    request,
+                    { continuation.resume(it) },
+                    { continuation.resumeWithException(it) }
+                )
             }
+            continuation.invokeOnCancellation { operation?.cancel() }
         }
+    }
 
     @ExperimentalCoroutinesApi
     @FlowPreview
diff --git a/core-kotlin/src/main/java/com/amplifyframework/kotlin/auth/KotlinAuthFacade.kt b/core-kotlin/src/main/java/com/amplifyframework/kotlin/auth/KotlinAuthFacade.kt
index b152dfe6c3..8eac30dc5a 100644
--- a/core-kotlin/src/main/java/com/amplifyframework/kotlin/auth/KotlinAuthFacade.kt
+++ b/core-kotlin/src/main/java/com/amplifyframework/kotlin/auth/KotlinAuthFacade.kt
@@ -131,16 +131,16 @@ class KotlinAuthFacade(private val delegate: Delegate = Amplify.Auth) : Auth {
         options: AuthWebUISignInOptions
     ):
         AuthSignInResult {
-            return suspendCoroutine { continuation ->
-                delegate.signInWithSocialWebUI(
-                    provider,
-                    callingActivity,
-                    options,
-                    { continuation.resume(it) },
-                    { continuation.resumeWithException(it) }
-                )
-            }
+        return suspendCoroutine { continuation ->
+            delegate.signInWithSocialWebUI(
+                provider,
+                callingActivity,
+                options,
+                { continuation.resume(it) },
+                { continuation.resumeWithException(it) }
+            )
         }
+    }
 
     override suspend fun signInWithWebUI(
         callingActivity: Activity,
diff --git a/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt b/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt
index 2d990e7eb4..52db4a110d 100644
--- a/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt
+++ b/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt
@@ -118,17 +118,17 @@ class KotlinDataStoreFacade(private val delegate: Delegate = Amplify.DataStore)
     @Throws(DataStoreException::class)
     override suspend fun <T : Model> observe(itemClass: KClass<T>, itemId: String):
         Flow<DataStoreItemChange<T>> {
-            val observation = Observation<DataStoreItemChange<T>>()
-            delegate.observe(
-                itemClass.java,
-                itemId,
-                { observation.starts.tryEmit(it) },
-                { observation.changes.tryEmit(it) },
-                { observation.failures.tryEmit(it) },
-                { observation.completions.tryEmit(Unit) }
-            )
-            return observation.waitForStart()
-        }
+        val observation = Observation<DataStoreItemChange<T>>()
+        delegate.observe(
+            itemClass.java,
+            itemId,
+            { observation.starts.tryEmit(it) },
+            { observation.changes.tryEmit(it) },
+            { observation.failures.tryEmit(it) },
+            { observation.completions.tryEmit(Unit) }
+        )
+        return observation.waitForStart()
+    }
 
     @OptIn(FlowPreview::class)
     @ExperimentalCoroutinesApi
diff --git a/core-kotlin/src/main/java/com/amplifyframework/kotlin/storage/KotlinStorageFacade.kt b/core-kotlin/src/main/java/com/amplifyframework/kotlin/storage/KotlinStorageFacade.kt
index 61307b0d14..163754362c 100644
--- a/core-kotlin/src/main/java/com/amplifyframework/kotlin/storage/KotlinStorageFacade.kt
+++ b/core-kotlin/src/main/java/com/amplifyframework/kotlin/storage/KotlinStorageFacade.kt
@@ -48,63 +48,63 @@ class KotlinStorageFacade(private val delegate: Delegate = Amplify.Storage) : St
     @Throws(StorageException::class)
     override suspend fun getUrl(key: String, options: StorageGetUrlOptions):
         StorageGetUrlResult {
-            return suspendCoroutine { continuation ->
-                delegate.getUrl(
-                    key,
-                    options,
-                    { continuation.resume(it) },
-                    { continuation.resumeWithException(it) }
-                )
-            }
+        return suspendCoroutine { continuation ->
+            delegate.getUrl(
+                key,
+                options,
+                { continuation.resume(it) },
+                { continuation.resumeWithException(it) }
+            )
         }
+    }
 
     @ExperimentalCoroutinesApi
     @FlowPreview
     override fun downloadFile(key: String, local: File, options: StorageDownloadFileOptions):
         InProgressStorageOperation<StorageDownloadFileResult> {
-            val progress = MutableSharedFlow<StorageTransferProgress>(replay = 1)
-            val results = MutableSharedFlow<StorageDownloadFileResult>(replay = 1)
-            val errors = MutableSharedFlow<StorageException>(replay = 1)
-            val operation = delegate.downloadFile(
-                key,
-                local,
-                options,
-                { progress.tryEmit(it) },
-                { results.tryEmit(it) },
-                { errors.tryEmit(it) }
-            )
-            return InProgressStorageOperation(
-                operation.transferId,
-                results.asSharedFlow(),
-                progress.asSharedFlow(),
-                errors.asSharedFlow(),
-                operation
-            )
-        }
+        val progress = MutableSharedFlow<StorageTransferProgress>(replay = 1)
+        val results = MutableSharedFlow<StorageDownloadFileResult>(replay = 1)
+        val errors = MutableSharedFlow<StorageException>(replay = 1)
+        val operation = delegate.downloadFile(
+            key,
+            local,
+            options,
+            { progress.tryEmit(it) },
+            { results.tryEmit(it) },
+            { errors.tryEmit(it) }
+        )
+        return InProgressStorageOperation(
+            operation.transferId,
+            results.asSharedFlow(),
+            progress.asSharedFlow(),
+            errors.asSharedFlow(),
+            operation
+        )
+    }
 
     @ExperimentalCoroutinesApi
     @FlowPreview
     override fun uploadFile(key: String, local: File, options: StorageUploadFileOptions):
         InProgressStorageOperation<StorageUploadFileResult> {
-            val progress = MutableSharedFlow<StorageTransferProgress>(replay = 1)
-            val results = MutableSharedFlow<StorageUploadFileResult>(replay = 1)
-            val errors = MutableSharedFlow<StorageException>(replay = 1)
-            val operation = delegate.uploadFile(
-                key,
-                local,
-                options,
-                { progress.tryEmit(it) },
-                { results.tryEmit(it) },
-                { errors.tryEmit(it) }
-            )
-            return InProgressStorageOperation(
-                operation.transferId,
-                results.asSharedFlow(),
-                progress.asSharedFlow(),
-                errors.asSharedFlow(),
-                operation
-            )
-        }
+        val progress = MutableSharedFlow<StorageTransferProgress>(replay = 1)
+        val results = MutableSharedFlow<StorageUploadFileResult>(replay = 1)
+        val errors = MutableSharedFlow<StorageException>(replay = 1)
+        val operation = delegate.uploadFile(
+            key,
+            local,
+            options,
+            { progress.tryEmit(it) },
+            { results.tryEmit(it) },
+            { errors.tryEmit(it) }
+        )
+        return InProgressStorageOperation(
+            operation.transferId,
+            results.asSharedFlow(),
+            progress.asSharedFlow(),
+            errors.asSharedFlow(),
+            operation
+        )
+    }
 
     @FlowPreview
     @ExperimentalCoroutinesApi
@@ -114,25 +114,25 @@ class KotlinStorageFacade(private val delegate: Delegate = Amplify.Storage) : St
         options: StorageUploadInputStreamOptions
     ):
         InProgressStorageOperation<StorageUploadInputStreamResult> {
-            val progress = MutableSharedFlow<StorageTransferProgress>(replay = 1)
-            val results = MutableSharedFlow<StorageUploadInputStreamResult>(replay = 1)
-            val errors = MutableSharedFlow<StorageException>(replay = 1)
-            val cancelable = delegate.uploadInputStream(
-                key,
-                local,
-                options,
-                { progress.tryEmit(it) },
-                { results.tryEmit(it) },
-                { errors.tryEmit(it) }
-            )
-            return InProgressStorageOperation(
-                cancelable.transferId,
-                results.asSharedFlow(),
-                progress.asSharedFlow(),
-                errors.asSharedFlow(),
-                cancelable
-            )
-        }
+        val progress = MutableSharedFlow<StorageTransferProgress>(replay = 1)
+        val results = MutableSharedFlow<StorageUploadInputStreamResult>(replay = 1)
+        val errors = MutableSharedFlow<StorageException>(replay = 1)
+        val cancelable = delegate.uploadInputStream(
+            key,
+            local,
+            options,
+            { progress.tryEmit(it) },
+            { results.tryEmit(it) },
+            { errors.tryEmit(it) }
+        )
+        return InProgressStorageOperation(
+            cancelable.transferId,
+            results.asSharedFlow(),
+            progress.asSharedFlow(),
+            errors.asSharedFlow(),
+            cancelable
+        )
+    }
 
     @Throws(StorageException::class)
     override suspend fun remove(key: String, options: StorageRemoveOptions): StorageRemoveResult {
diff --git a/core/build.gradle b/core/build.gradle
index 4da684e9fc..13b3c6b270 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -61,11 +61,6 @@ dependencies {
 }
 
 afterEvaluate {
-    // This reduces the amount of desugaring warnings.
-    // See https://issuetracker.google.com/issues/157681341
-    // This will be fixed in AGP 4.1.0+.
-    it.android.buildTypes.debug.debuggable = false
-
     // Disables this warning:
     // warning: [classfile] MethodParameters attribute
     // introduced in version 52.0 class files is ignored in
diff --git a/core/src/main/java/com/amplifyframework/api/graphql/PaginatedResult.java b/core/src/main/java/com/amplifyframework/api/graphql/PaginatedResult.java
index ef3e81856a..d2a8717818 100644
--- a/core/src/main/java/com/amplifyframework/api/graphql/PaginatedResult.java
+++ b/core/src/main/java/com/amplifyframework/api/graphql/PaginatedResult.java
@@ -15,10 +15,8 @@
 
 package com.amplifyframework.api.graphql;
 
-import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.core.util.ObjectsCompat;
 
 import java.util.Iterator;
@@ -38,7 +36,8 @@ public final class PaginatedResult<T> implements Iterable<T> {
 
     /**
      * Creates a PaginatedResult.
-     * @param items Iterable&lt;T&gt; of the items from the response.
+     *
+     * @param items                Iterable&lt;T&gt; of the items from the response.
      * @param requestForNextResult a GraphQLRequest to obtain the next page of results, or null if no next page.
      */
     public PaginatedResult(@NonNull Iterable<T> items,
@@ -49,6 +48,7 @@ public PaginatedResult(@NonNull Iterable<T> items,
 
     /**
      * Returns the list of items obtained from an API query.
+     *
      * @return Iterable of Model objects
      */
     public Iterable<T> getItems() {
@@ -57,6 +57,7 @@ public Iterable<T> getItems() {
 
     /**
      * Returns whether a subsequent page of results is available from the API.
+     *
      * @return boolean whether a subsequent page is available
      */
     public boolean hasNextResult() {
@@ -106,14 +107,12 @@ public String toString() {
     public Iterator<T> iterator() {
         return items.iterator();
     }
-
-    @RequiresApi(api = Build.VERSION_CODES.N)
+    
     @Override
     public void forEach(@NonNull Consumer<? super T> action) {
         items.forEach(action);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.N)
     @NonNull
     @Override
     public Spliterator<T> spliterator() {
diff --git a/core/src/main/res/values/dev_menu_strings.xml b/core/src/main/res/values/dev_menu_strings.xml
index 3b4093d378..cf29cb9974 100644
--- a/core/src/main/res/values/dev_menu_strings.xml
+++ b/core/src/main/res/values/dev_menu_strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
    Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License").
@@ -25,12 +24,10 @@
     <string name="logs_view_title">Logs</string>
     <string name="file_issue_view_title">File Issue</string>
     <string name="search_logs_hint">Enter search phrase…</string>
-    <string name="search_logs_button_text">Search</string>
     <string name="placeholder_logs">Search results will appear here…</string>
     <string name="placeholder_device_info">Waiting for device info…</string>
     <string name="placeholder_env_info">Waiting for environment info…</string>
     <string name="file_issue_hint">Please enter a brief description…</string>
-    <string name="empty" />
     <string name="copy_issue_text">Copy to Clipboard</string>
     <string name="file_issue_warning_text">
         After pressing \"File Issue\", you will have the opportunity to review the
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7a3265ee94..e708b1c023 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 627e5c4337..ae04661ee7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Feb 10 01:00:54 CST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d517..4f906e0c81 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a2..ac1b06f938 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/maplibre-adapter/src/main/res/values/colors.xml b/maplibre-adapter/src/main/res/values/colors.xml
index e131ab2d94..e0a3ae6c9c 100644
--- a/maplibre-adapter/src/main/res/values/colors.xml
+++ b/maplibre-adapter/src/main/res/values/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
    Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License").
@@ -22,6 +21,4 @@
     <color name="map_controls_background">#ffffff</color>
     <color name="map_controls_border">#bcbcbc</color>
     <color name="map_controls_foreground">#646464</color>
-
-    <color name="map_loadingBackground">#4dffffff</color>
 </resources>
diff --git a/maplibre-adapter/src/main/res/values/dimens.xml b/maplibre-adapter/src/main/res/values/dimens.xml
index d227e4e8d8..4f92e99068 100644
--- a/maplibre-adapter/src/main/res/values/dimens.xml
+++ b/maplibre-adapter/src/main/res/values/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
    Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License").
@@ -38,8 +37,6 @@
     <dimen name="map_search_infoTextSize">16sp</dimen>
     <dimen name="map_search_inputPadding">6dp</dimen>
     <dimen name="map_search_itemPadding">16dp</dimen>
-    <dimen name="map_search_itemTextSize">16sp</dimen>
-    <dimen name="map_search_padding">48dp</dimen>
     <dimen name="map_search_updateButtonPadding">20dp</dimen>
     <dimen name="map_search_resultTopHandleHeight">28dp</dimen>
     <dimen name="map_search_resultTopHandleRadius">18dp</dimen>
diff --git a/scripts/devicefarm-test-runner-buildspec.yml b/scripts/devicefarm-test-runner-buildspec.yml
index 6a83b1b7ac..f6a1ee786b 100644
--- a/scripts/devicefarm-test-runner-buildspec.yml
+++ b/scripts/devicefarm-test-runner-buildspec.yml
@@ -16,13 +16,25 @@ env:
 phases:
   install:
     runtime-versions:
-      android: 29
       nodejs: 12
       python: 3.8
+      java: corretto11
     commands:
       - echo 'Install phase starting'
       - npm install -g xunit-viewer
       - pip3 install junit-xml
+      ### INSTALL ANDROID 31
+      - export ANDROID_TOOLS_FILENAME="commandlinetools-linux-9123335_latest.zip"
+      - wget https://dl.google.com/android/repository/$ANDROID_TOOLS_FILENAME -P ~ > /dev/null
+      - unzip ~/$ANDROID_TOOLS_FILENAME -d ~ > /dev/null 2>&1
+      - mkdir -p /usr/local/android-sdk-linux/cmdline-tools
+      - mv ~/cmdline-tools /usr/local/android-sdk-linux/cmdline-tools/latest
+      - export PATH=/usr/local/android-sdk-linux/cmdline-tools/latest:/usr/local/android-sdk-linux/cmdline-tools/latest/bin:/usr/local/android-sdk-linux/platform-tools:$PATH
+      - export ANDROID_SDK_ROOT=/usr/local/android-sdk-linux
+      - yes | sdkmanager --licenses > /dev/null
+      - sdkmanager "platform-tools" "platforms;android-31" > /dev/null
+      - sdkmanager "build-tools;31.0.0" > /dev/null
+      ### END INSTALL ANDROID 31
     finally:
       - echo 'Install phase completed.'
   pre_build:
@@ -32,7 +44,7 @@ phases:
       - |
         if [[ -z "${CONFIG_SOURCE_BUCKET}" ]]; then
           echo 'Pulling config files from Amplify'
-          JAVA_HOME=$JDK_8_HOME ./gradlew pullBackendConfigFromAmplify
+          JAVA_HOME=$JDK_11_HOME ./gradlew pullBackendConfigFromAmplify
         else
           echo 'Pulling config files from S3'
           ./scripts/pull_backend_config_from_s3 ${CONFIG_SOURCE_BUCKET}
@@ -42,8 +54,8 @@ phases:
   build:
     commands:
       - echo 'Build phase starting.'
-      - JAVA_HOME=$JDK_8_HOME ./gradlew assembleAndroidTest
-      - JAVA_HOME=$JDK_8_HOME ./gradlew runTestsInDeviceFarm
+      - JAVA_HOME=$JDK_11_HOME ./gradlew assembleAndroidTest
+      - JAVA_HOME=$JDK_11_HOME ./gradlew runTestsInDeviceFarm
     finally:
       - echo 'Build phase completed.'
   post_build:
@@ -71,4 +83,4 @@ artifacts:
         - '**/*'
       name: DevicefarmTestRunReport
       base-directory: 'build/reports/instrumented'
-      discard-paths: no
\ No newline at end of file
+      discard-paths: no
diff --git a/scripts/maven-release-publisher.yml b/scripts/maven-release-publisher.yml
index e0c83e1342..74f85f63de 100644
--- a/scripts/maven-release-publisher.yml
+++ b/scripts/maven-release-publisher.yml
@@ -9,6 +9,8 @@ env:
     ORG_GRADLE_PROJECT_signingInMemoryKey: awsmobilesdk/android/signing:inMemoryKey
 phases:
   install:
+    runtime-versions:
+      java: corretto11
     commands:
       - echo 'Install phase starting'
     finally:
@@ -24,10 +26,10 @@ phases:
       - |
         # List all available gradle tasks, grep for the uploadArchive tasks, and then use cut to strip the
         # task description and just return the name of the task, one for each module (e.g. aws-api:publish)
-        JAVA_HOME=$JDK_8_HOME ./gradlew clean build
+        JAVA_HOME=$JDK_11_HOME ./gradlew clean build
         for task_name in $(./gradlew tasks --all | grep ":publish " | cut -d " " -f 1); do
           echo "Gradle task $task_name"
-          JAVA_HOME=$JDK_8_HOME ./gradlew $task_name;
+          JAVA_HOME=$JDK_11_HOME ./gradlew $task_name;
         done
     finally:
       - echo 'Build phase completed.'
diff --git a/scripts/pr-builder-buildspec.yml b/scripts/pr-builder-buildspec.yml
index ffa4dd37ef..8c44300bec 100644
--- a/scripts/pr-builder-buildspec.yml
+++ b/scripts/pr-builder-buildspec.yml
@@ -16,10 +16,22 @@ env:
 phases:
   install:
     runtime-versions:
-      android: 29
       nodejs: 12
+      java: corretto11
     commands:
       - echo 'Install phase starting'
+      ### INSTALL ANDROID 31
+      - export ANDROID_TOOLS_FILENAME="commandlinetools-linux-9123335_latest.zip"
+      - wget https://dl.google.com/android/repository/$ANDROID_TOOLS_FILENAME -P ~ > /dev/null
+      - unzip ~/$ANDROID_TOOLS_FILENAME -d ~ > /dev/null 2>&1
+      - mkdir -p /usr/local/android-sdk-linux/cmdline-tools
+      - mv ~/cmdline-tools /usr/local/android-sdk-linux/cmdline-tools/latest
+      - export PATH=/usr/local/android-sdk-linux/cmdline-tools/latest:/usr/local/android-sdk-linux/cmdline-tools/latest/bin:/usr/local/android-sdk-linux/platform-tools:$PATH
+      - export ANDROID_SDK_ROOT=/usr/local/android-sdk-linux
+      - yes | sdkmanager --licenses > /dev/null
+      - sdkmanager "platform-tools" "platforms;android-31" > /dev/null
+      - sdkmanager "build-tools;31.0.0" > /dev/null
+      ### END INSTALL ANDROID 31
     finally:
       - echo 'Install phase completed.'
   pre_build:
@@ -30,7 +42,7 @@ phases:
   build:
     commands:
       - echo 'Build phase starting.'
-      - JAVA_HOME=$JDK_8_HOME ./gradlew build
+      - JAVA_HOME=$JDK_11_HOME ./gradlew build
     finally:
       - echo 'Build phase completed.'
   post_build: