diff --git a/build.gradle.kts b/build.gradle.kts index 6cb11f6..b033123 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.application") version "8.3.2" apply false + id("com.android.library") version "8.3.2" apply false id("org.jetbrains.kotlin.android") version Version.kotlin apply false - id("org.jetbrains.dokka") version "1.9.10" apply false - id("com.google.gms.google-services") version "4.4.0" apply false - id("org.jetbrains.kotlinx.kover") version "0.7.5" apply false + id("org.jetbrains.dokka") version "1.9.20" apply false + id("com.google.gms.google-services") version "4.4.1" apply false + id("org.jetbrains.kotlinx.kover") version "0.7.6" apply false id("org.sonarqube") version "4.4.1.3373" apply true - id("io.gitlab.arturbosch.detekt") version "1.23.4" apply false + id("io.gitlab.arturbosch.detekt") version "1.23.5" apply false } buildscript { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1a12c75..775235e 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -13,6 +13,6 @@ repositories { } dependencies { - implementation("com.diffplug.spotless:spotless-plugin-gradle:6.24.0") - implementation("org.owasp:dependency-check-gradle:9.0.9") + implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0") + implementation("org.owasp:dependency-check-gradle:9.1.0") } diff --git a/buildSrc/src/main/java/Version.kt b/buildSrc/src/main/java/Version.kt index 75a77c8..5c34217 100644 --- a/buildSrc/src/main/java/Version.kt +++ b/buildSrc/src/main/java/Version.kt @@ -2,14 +2,14 @@ * Version variables */ object Version { - const val kotlin = "1.9.22" - const val kotlinSerialization = "1.6.2" - const val coroutine = "1.7.3" + const val kotlin = "1.9.23" + const val kotlinSerialization = "1.6.3" + const val coroutine = "1.8.0" const val room = "2.6.1" const val extJunit = "1.1.5" const val archLifecycleVersion = "2.7.0" - const val compose = "1.5.4" - const val composeCompiler = "1.5.8" + const val compose = "1.6.6" + const val composeCompiler = "1.5.12" const val devicesAuthenticator = "0.0.15" const val devicesCore = "0.0.15" const val devicesStorage = "0.0.15" diff --git a/devices-push/build.gradle.kts b/devices-push/build.gradle.kts index fcc7e44..d6b11c5 100644 --- a/devices-push/build.gradle.kts +++ b/devices-push/build.gradle.kts @@ -58,14 +58,16 @@ android { dependencies { api("com.okta.devices:devices-authenticator:${Version.devicesAuthenticator}") - implementation("com.okta.devices:devices-core:${Version.devicesCore}") + implementation("com.okta.devices:devices-core:${Version.devicesCore}") { + exclude(group = "com.google.android.gms", module = "play-services-safetynet") + } implementation("com.okta.devices:devices-storage:${Version.devicesStorage}") implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Version.archLifecycleVersion}") implementation("androidx.biometric:biometric:1.2.0-alpha05") implementation("org.jetbrains.kotlin:kotlin-stdlib:${Version.kotlin}") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Version.coroutine}") - implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.core:core-ktx:1.13.0") implementation("io.jsonwebtoken:jjwt-api:0.11.5") runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5") runtimeOnly("io.jsonwebtoken:jjwt-orgjson:0.11.5") { @@ -74,16 +76,18 @@ dependencies { implementation("com.squareup.okhttp3:okhttp:4.12.0") testImplementation("com.squareup.okhttp3:logging-interceptor:4.12.0") - testImplementation("com.okta.devices:devices-fake-server:${Version.devicesFakeServer}") + testImplementation("com.okta.devices:devices-fake-server:${Version.devicesFakeServer}") { + exclude(group = "com.google.android.gms", module = "play-services-safetynet") + } testImplementation("androidx.arch.core:core-testing:2.2.0") testImplementation("androidx.room:room-testing:${Version.room}") testImplementation("org.jetbrains.kotlin:kotlin-test:${Version.kotlin}") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Version.coroutine}") testImplementation("junit:junit:4.13.2") testImplementation("androidx.test.ext:junit-ktx:${Version.extJunit}") - testImplementation("org.robolectric:robolectric:4.11.1") + testImplementation("org.robolectric:robolectric:4.12.1") testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0") - testImplementation("io.mockk:mockk:1.13.9") + testImplementation("io.mockk:mockk:1.13.10") testImplementation("org.hamcrest:hamcrest-library:2.2") testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Version.kotlinSerialization}") testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-properties:${Version.kotlinSerialization}") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/push-sample-app/build.gradle.kts b/push-sample-app/build.gradle.kts index 368fe7e..6417d27 100644 --- a/push-sample-app/build.gradle.kts +++ b/push-sample-app/build.gradle.kts @@ -73,10 +73,10 @@ dependencies { implementation("com.okta.kotlin:oauth2") implementation("com.okta.kotlin:web-authentication-ui") - implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.core:core-ktx:1.13.0") implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.biometric:biometric:1.2.0-alpha05") - implementation("androidx.activity:activity-compose:1.8.2") + implementation("androidx.activity:activity-compose:1.9.0") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:${Version.archLifecycleVersion}") implementation("androidx.compose.material:material:${Version.compose}") implementation("androidx.compose.ui:ui:${Version.compose}") @@ -84,12 +84,12 @@ dependencies { implementation("androidx.compose.ui:ui-tooling-preview:${Version.compose}") implementation("androidx.compose.runtime:runtime:${Version.compose}") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.0") implementation("com.jakewharton.timber:timber:5.0.1") // Firebase BoM - implementation(platform("com.google.firebase:firebase-bom:32.7.0")) + implementation(platform("com.google.firebase:firebase-bom:32.8.1")) implementation("com.google.firebase:firebase-messaging-ktx") implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06") } diff --git a/push-sample-app/proguard-rules.pro b/push-sample-app/proguard-rules.pro index 3e4429c..c3e4169 100644 --- a/push-sample-app/proguard-rules.pro +++ b/push-sample-app/proguard-rules.pro @@ -31,4 +31,7 @@ -dontwarn com.google.api.client.http.HttpTransport -dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder -dontwarn com.google.api.client.http.javanet.NetHttpTransport --dontwarn org.joda.time.Instant \ No newline at end of file +-dontwarn org.joda.time.Instant +-dontwarn com.google.android.gms.safetynet.SafetyNet +-dontwarn com.google.android.gms.safetynet.SafetyNetApi$AttestationResponse +-dontwarn com.google.android.gms.safetynet.SafetyNetClient \ No newline at end of file