Merge conflict with main is resolved

Author: pmathew92

.github/workflows/test.yml

@@ -29,4 +29,4 @@ jobs:
 
       - run: ./gradlew clean test jacocoTestReport lint --continue --console=plain --max-workers=1 --no-daemon
 
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # pin@4.5.0
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # pin@5.4.0

.version

@@ -1 +1 @@
-3.4.0
+3.5.0

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [3.5.0](https://github.com/auth0/Auth0.Android/tree/3.5.0) (2025-03-17)
+[Full Changelog](https://github.com/auth0/Auth0.Android/compare/3.4.0...3.5.0)
+
+**Added**
+- Updated documentation to pass an activity context for login and logout [\#808](https://github.com/auth0/Auth0.Android/pull/808) ([pmathew92](https://github.com/pmathew92))
+- Add to CustomTabsOptions ability to disable opening auth in custom tab [\#806](https://github.com/auth0/Auth0.Android/pull/806) ([bennycao](https://github.com/bennycao))
+
+**Changed**
+- Fixed the java samples in the Example.md file [\#807](https://github.com/auth0/Auth0.Android/pull/807) ([pmathew92](https://github.com/pmathew92))
+
 ## [3.4.0](https://github.com/auth0/Auth0.Android/tree/3.4.0) (2025-02-13)
 [Full Changelog](https://github.com/auth0/Auth0.Android/compare/3.3.0...3.4.0)
 

README.md

@@ -51,7 +51,7 @@ To install Auth0.Android with [Gradle](https://gradle.org/), simply add the foll
 
 ```gradle
 dependencies {
-    implementation 'com.auth0.android:auth0:3.4.0'
+    implementation 'com.auth0.android:auth0:3.5.0'
 }
 ```
 

auth0/src/main/java/com/auth0/android/authentication/AuthenticationAPIClient.kt

@@ -943,7 +943,7 @@ public class AuthenticationAPIClient @VisibleForTesting(otherwise = VisibleForTe
      * @param refreshToken A valid refresh token obtained as part of Auth0 authentication
      * @return a request to fetch a session token
      */
-    public fun fetchSessionToken(refreshToken: String): Request<SSOCredentials, AuthenticationException> {
+    internal fun fetchSessionToken(refreshToken: String): Request<SSOCredentials, AuthenticationException> {
         val params = ParameterBuilder.newBuilder()
             .setClientId(clientId)
             .setGrantType(ParameterBuilder.GRANT_TYPE_TOKEN_EXCHANGE)

auth0/src/main/java/com/auth0/android/authentication/storage/BaseCredentialsManager.kt

@@ -34,7 +34,7 @@ public abstract class BaseCredentialsManager internal constructor(
     public abstract fun saveApiCredentials(apiCredentials: APICredentials, audience: String)
     public abstract fun saveSsoCredentials(ssoCredentials: SSOCredentials)
     public abstract fun getCredentials(callback: Callback<Credentials, CredentialsManagerException>)
-    public abstract fun getSsoCredentials(callback: Callback<SSOCredentials, CredentialsManagerException>)
+    internal abstract fun getSsoCredentials(callback: Callback<SSOCredentials, CredentialsManagerException>)
     public abstract fun getCredentials(
         scope: String?,
         minTtl: Int,
@@ -76,7 +76,7 @@ public abstract class BaseCredentialsManager internal constructor(
 
     @JvmSynthetic
     @Throws(CredentialsManagerException::class)
-    public abstract suspend fun awaitSsoCredentials(): SSOCredentials
+    internal abstract suspend fun awaitSsoCredentials(): SSOCredentials
 
     @JvmSynthetic
     @Throws(CredentialsManagerException::class)