Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ dependencies {
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.navigation.fragment.ktx)
implementation(libs.androidx.navigation.ui.ktx)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.androidx.browser)
implementation(libs.androidx.lifecycle.runtime.ktx)
Expand Down
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import io.gitlab.arturbosch.detekt.report.ReportMergeTask

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "9.1.1" apply false
id("org.jetbrains.kotlin.android") version "2.2.21" apply false
id("com.android.library") version "9.1.1" apply false
id("com.android.application") version "9.2.1" apply false
id("org.jetbrains.kotlin.android") version "2.3.21" apply false
id("com.android.library") version "9.2.1" apply false
id("io.gitlab.arturbosch.detekt") version "1.23.8"
id("org.jetbrains.dokka") version "2.1.0"
id("org.jetbrains.dokka") version "2.2.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"

kotlin("jvm") version "2.2.21"
kotlin("plugin.serialization") version "2.2.21"
kotlin("jvm") version "2.3.21"
kotlin("plugin.serialization") version "2.3.21"
}

val detektReportMergeSarif by tasks.registering(ReportMergeTask::class) {
Expand Down
21 changes: 18 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
[versions]
androidbrowserhelper = "2.7.1"
appauth = "0.11.1"
appcompat = "1.7.1"
browser = "1.10.0"
constraintlayout = "2.2.1"
coreKtx = "1.18.0"
datastorePreferences = "1.2.1"
espresso = "3.7.0"
junit = "1.3.0"
junitVersion = "4.13.2"
kotlinx = "1.10.2"
kotlinx = "1.11.0"
lifecycleRuntimeKtx = "2.10.0"
material = "1.13.0"
navigation = "2.9.7"
material = "1.14.0"
mockitoCore = "5.23.0"
mockitoKotlin = "6.3.0"
navigation = "2.9.8"
roomCompiler = "2.8.4"
securityCryptoKtx = "1.1.0"
test = "1.7.0"
uiautomator = "2.3.0"

[libraries]
androidbrowserhelper = { module = "com.google.androidbrowserhelper:androidbrowserhelper", version.ref = "androidbrowserhelper" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "browser" }
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
androidx-espresso-contrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "espresso" }
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
androidx-espresso-intents = { group = "androidx.test.espresso", name = "espresso-intents", version.ref = "espresso" }
Expand All @@ -29,8 +37,15 @@ androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "roomCompiler" }
androidx-rules = { group = "androidx.test", name = "rules", version.ref = "test" }
androidx-runner = { group = "androidx.test", name = "runner", version.ref = "test" }
androidx-security-crypto-ktx = { module = "androidx.security:security-crypto-ktx", version.ref = "securityCryptoKtx" }
androidx-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
appauth = { module = "net.openid:appauth", version.ref = "appauth" }
junit = { group = "junit", name = "junit", version.ref = "junitVersion" }
kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx" }
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx" }
kotlinx-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cbor", version.ref = "kotlinx" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore" }
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 4 additions & 7 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 10 additions & 22 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,20 @@ signing {

dependencies {

implementation("androidx.core:core-ktx:1.18.0")
implementation("androidx.appcompat:appcompat:1.7.1")
implementation("com.google.androidbrowserhelper:androidbrowserhelper:2.6.2")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.10.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
implementation("net.openid:appauth:0.11.1")
implementation("androidx.security:security-crypto-ktx:1.1.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
implementation("androidx.datastore:datastore-preferences:1.2.1")
testImplementation("junit:junit:4.13.2")
testImplementation("org.mockito:mockito-core:5.23.0")
testImplementation("org.mockito.kotlin:mockito-kotlin:6.2.3")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
androidTestImplementation("androidx.test.ext:junit:1.3.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.androidbrowserhelper)
implementation(libs.kotlinx.serialization.cbor)
implementation(libs.kotlinx.serialization.json)
implementation(libs.appauth)
implementation(libs.androidx.security.crypto.ktx)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.coroutines.android)
implementation(libs.androidx.datastore.preferences)
testImplementation(libs.junit)
testImplementation(libs.mockito.core)
testImplementation(libs.mockito.kotlin)
testImplementation(libs.kotlinx.coroutines.test)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import java.net.HttpURLConnection
import java.util.concurrent.atomic.AtomicReference
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException
import kotlin.coroutines.suspendCoroutine
import androidx.core.net.toUri
import kotlinx.coroutines.suspendCancellableCoroutine

Expand Down Expand Up @@ -345,6 +344,7 @@ class OAuthAuthorizationService internal constructor(
* @param ex The authorization exception received from the authorization process, or null if no exception occurred.
* @return The token response from the authorization service.
*/
@Suppress("RedundantSuspendModifier")
private suspend fun performTokenRequest(
response: AuthorizationResponse,
ex: net.openid.appauth.AuthorizationException?
Expand Down Expand Up @@ -406,6 +406,7 @@ class OAuthAuthorizationService internal constructor(
*
* @return The [AuthorizationServiceConfiguration] object.
*/
@Suppress("RedundantSuspendModifier")
private suspend fun fetchConfiguration(): AuthorizationServiceConfiguration {
val uriBuilder = fusionAuthUrl.toUri().buildUpon()

Expand Down Expand Up @@ -488,7 +489,7 @@ class OAuthAuthorizationService internal constructor(
val refreshToken = authState.refreshToken
?: throw AuthorizationException("No refresh token available")

val response = suspendCoroutine<TokenResponse> { continuation ->
val response = suspendCancellableCoroutine<TokenResponse> { continuation ->
authService.performTokenRequest(
TokenRequest.Builder(config, clientId)
.setGrantType(GrantTypeValues.REFRESH_TOKEN)
Expand All @@ -500,7 +501,7 @@ class OAuthAuthorizationService internal constructor(
if (response != null) {
continuation.resume(response)
} else {
continuation.resumeWithException(exception?.let { AuthorizationException(it) }
continuation.resumeWithException(exception?.let { AuthorizationException(it) }
?: AuthorizationException("Unknown error"))
}
}
Expand Down
Loading