Skip to content

Commit

Permalink
update latest libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
FeiChen-okta committed Sep 23, 2024
1 parent 800d32e commit 4b40ded
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 13 deletions.
8 changes: 5 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.5.2" apply false
id("com.android.library") version "8.5.2" apply false
id("com.android.application") version "8.6.1" apply false
id("com.android.library") version "8.6.1" apply false
id("org.jetbrains.kotlin.android") version Version.kotlin apply false
id("org.jetbrains.dokka") version "1.9.20" apply false
id("com.google.gms.google-services") version "4.4.2" apply false
Expand All @@ -13,7 +13,9 @@ plugins {
buildscript {
configurations.all {
resolutionStrategy {
force("com.fasterxml.woodstox:woodstox-core:6.6.1")
force("com.google.protobuf:protobuf-java:3.25.5")
force("com.google.android.gms:play-services-basement:18.4.0")
force("io.netty:netty-codec-http2:4.1.108.Final")
force("com.fasterxml.jackson.core:jackson-core:2.17.2")
// https://issuetracker.google.com/issues/340202290
// AGP introduced incompatible bc versions. Forces the version that AGP uses.
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/Version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
*/
object Version {
const val kotlin = "2.0.20"
const val kotlinSerialization = "1.7.1"
const val kotlinSerialization = "1.7.2"
const val coroutine = "1.8.1"
const val room = "2.6.1"
const val extJunit = "1.2.1"
const val archLifecycleVersion = "2.8.4"
const val compose = "1.6.8"
const val archLifecycleVersion = "2.8.6"
const val compose = "1.7.2"
const val devicesAuthenticator = "1.0.41"
const val devicesCore = "1.0.41"
const val devicesStorage = "1.0.41"
Expand Down
2 changes: 1 addition & 1 deletion devices-push/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ android {
}

dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.0")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
api("com.okta.devices:devices-authenticator:${Version.devicesAuthenticator}")
implementation("com.okta.devices:devices-core:${Version.devicesCore}") {
exclude(group = "com.google.android.gms", module = "play-services-safetynet")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
6 changes: 3 additions & 3 deletions push-sample-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ android {
}

dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.0")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
implementation(project(":devices-push"))

implementation(platform("com.okta.kotlin:bom:1.2.0"))
Expand All @@ -77,7 +77,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.appcompat:appcompat:1.7.0")
implementation("androidx.biometric:biometric:1.2.0-alpha05")
implementation("androidx.activity:activity-compose:1.9.1")
implementation("androidx.activity:activity-compose:1.9.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:${Version.archLifecycleVersion}")
implementation("androidx.compose.material:material:${Version.compose}")
implementation("androidx.compose.ui:ui:${Version.compose}")
Expand All @@ -90,7 +90,7 @@ dependencies {
implementation("com.jakewharton.timber:timber:5.0.1")

// Firebase BoM
implementation(platform("com.google.firebase:firebase-bom:33.2.0"))
implementation(platform("com.google.firebase:firebase-bom:33.3.0"))
implementation("com.google.firebase:firebase-messaging-ktx")
implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06")
}

0 comments on commit 4b40ded

Please sign in to comment.