Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exclude safetynet and update libraries #66

Merged
merged 1 commit into from
Apr 26, 2024
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
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
10 changes: 5 additions & 5 deletions buildSrc/src/main/java/Version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 9 additions & 5 deletions devices-push/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions push-sample-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,23 @@ 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}")
implementation("androidx.compose.ui:ui-tooling:${Version.compose}")
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")
}
5 changes: 4 additions & 1 deletion push-sample-app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
-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
Loading