Skip to content

Commit d5c68ee

Browse files
Aaron-Ritterdependabot[bot]mrudatsprint
authored
ci: workflows update (#214)
* build(deps): bump the prod-github-actions group with 2 updates Bumps the prod-github-actions group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [gradle/actions](https://github.com/gradle/actions). Updates `github/codeql-action` from 3.28.17 to 3.28.18 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@v3.28.17...v3.28.18) Updates `gradle/actions` from 4.3.1 to 4.4.0 - [Release notes](https://github.com/gradle/actions/releases) - [Commits](gradle/actions@06832c7...8379f6a) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.28.18 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-github-actions - dependency-name: gradle/actions dependency-version: 4.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-github-actions ... Signed-off-by: dependabot[bot] <support@github.com> * ci: add push-main-trigger to advanced security workflows - the github advanced security template suggests the push main branch trigger * ci: remove gradle-home-cache-cleanup - Solves #210 - If you are using gradle-home-cache-cleanup: true in your workflow, you can remove this option as this is now enabled by default. https://github.com/gradle/actions/blob/main/docs/deprecation-upgrade-guide.md#the-gradle-home-cache-cleanup-input-parameter-has-been-replaced-by-cache-cleanup * refactor: reformat workflow * Update libraries. * Datekt Scan that failed in datekt.yml github workflow. * fix syntax error. * Android Lint detected unused file. * manually test a new release-please-action token. * Revert back. * version updates. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mike Rudat <mike.rudat@fusionauth.io>
1 parent 51b983e commit d5c68ee

9 files changed

Lines changed: 20 additions & 19 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
name: Vulnerability Scan with CodeQL
1313

1414
on:
15+
push:
16+
branches: [ "main" ]
1517
pull_request:
1618
branches: [ "main" ]
1719
schedule:

.github/workflows/detekt.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
name: Vulnerability Scan with Detekt
1919

2020
on:
21+
push:
22+
branches: [ "main" ]
2123
pull_request:
2224
branches: [ "main" ]
2325
schedule:

.github/workflows/lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
name: Check Code Quality with Android Lint
1515

1616
on:
17+
push:
18+
branches: [ "main" ]
1719
pull_request:
1820
branches: [ "main" ]
1921
# Allows you to run this workflow manually from the Actions tab

.github/workflows/mobsf.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
name: Vulnerability Scan with MobSF
77

88
on:
9+
push:
10+
branches: [ "main" ]
911
pull_request:
1012
branches: [ "main" ]
1113
schedule:

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Release
33
on:
44
# Triggers the workflow on push events but only for default and protected branches
55
push:
6-
branches:
7-
- main
6+
branches: [ "main" ]
87

98
# The different jobs of this workflow need the following permissions
109
permissions:

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ dependencies {
5656
implementation("com.google.android.material:material:1.13.0")
5757
implementation(project(":library"))
5858
implementation("androidx.constraintlayout:constraintlayout:2.2.1")
59-
implementation("androidx.navigation:navigation-fragment-ktx:2.9.6")
60-
implementation("androidx.navigation:navigation-ui-ktx:2.9.6")
59+
implementation("androidx.navigation:navigation-fragment-ktx:2.9.7")
60+
implementation("androidx.navigation:navigation-ui-ktx:2.9.7")
6161
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
6262
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
6363
implementation("androidx.browser:browser:1.9.0")

app/src/main/res/raw/fusionauth_config_reset_configuration.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

library/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,19 @@ signing {
151151

152152
dependencies {
153153

154-
implementation("androidx.core:core-ktx:1.17.0")
154+
implementation("androidx.core:core-ktx:1.18.0")
155155
implementation("androidx.appcompat:appcompat:1.7.1")
156156
implementation("com.google.androidbrowserhelper:androidbrowserhelper:2.6.2")
157-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.9.0")
158-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
157+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.10.0")
158+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
159159
implementation("net.openid:appauth:0.11.1")
160160
implementation("androidx.security:security-crypto-ktx:1.1.0")
161161
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
162162
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
163-
implementation("androidx.datastore:datastore-preferences:1.2.0")
163+
implementation("androidx.datastore:datastore-preferences:1.2.1")
164164
testImplementation("junit:junit:4.13.2")
165-
testImplementation("org.mockito:mockito-core:5.21.0")
166-
testImplementation("org.mockito.kotlin:mockito-kotlin:6.1.0")
165+
testImplementation("org.mockito:mockito-core:5.23.0")
166+
testImplementation("org.mockito.kotlin:mockito-kotlin:6.2.3")
167167
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
168168
androidTestImplementation("androidx.test.ext:junit:1.3.0")
169169
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")

library/src/main/java/io/fusionauth/mobilesdk/oauth/OAuthAuthorizationService.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import kotlin.coroutines.resume
3939
import kotlin.coroutines.resumeWithException
4040
import kotlin.coroutines.suspendCoroutine
4141
import androidx.core.net.toUri
42+
import kotlinx.coroutines.suspendCancellableCoroutine
4243

4344
/**
4445
* OAuthAuthorizationService class is responsible for handling OAuth authorization and authorization process.
@@ -346,7 +347,7 @@ class OAuthAuthorizationService internal constructor(
346347
response: AuthorizationResponse,
347348
ex: net.openid.appauth.AuthorizationException?
348349
): TokenResponse {
349-
return suspendCoroutine { continuation ->
350+
return suspendCancellableCoroutine { continuation ->
350351
val authService = getAuthorizationService()
351352

352353
appAuthState.update(response, ex)
@@ -413,7 +414,7 @@ class OAuthAuthorizationService internal constructor(
413414
uriBuilder.appendPath(AuthorizationServiceConfiguration.WELL_KNOWN_PATH)
414415
.appendPath(AuthorizationServiceConfiguration.OPENID_CONFIGURATION_RESOURCE)
415416

416-
return suspendCoroutine { continuation ->
417+
return suspendCancellableCoroutine { continuation ->
417418
AuthorizationServiceConfiguration.fetchFromUrl(
418419
uriBuilder.build(),
419420
{ configuration, ex ->

0 commit comments

Comments
 (0)