Skip to content

Commit

Permalink
Update AGP and other libraries
Browse files Browse the repository at this point in the history
Keep the tools and libraries up to date
  • Loading branch information
FeiChen-okta committed Jan 18, 2024
1 parent 8d47890 commit 2241579
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 22 deletions.
4 changes: 2 additions & 2 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.2.0" apply false
id("com.android.library") version "8.2.0" apply false
id("com.android.application") version "8.2.1" apply false
id("com.android.library") version "8.2.1" 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
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.23.3")
implementation("org.owasp:dependency-check-gradle:9.0.3")
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.24.0")
implementation("org.owasp:dependency-check-gradle:9.0.9")
}
6 changes: 3 additions & 3 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.21"
const val kotlin = "1.9.22"
const val kotlinSerialization = "1.6.2"
const val coroutine = "1.7.3"
const val room = "2.6.1"
const val extJunit = "1.1.5"
const val archLifecycleVersion = "2.6.2"
const val archLifecycleVersion = "2.7.0"
const val compose = "1.5.4"
const val composeCompiler = "1.5.6"
const val composeCompiler = "1.5.8"
const val devicesAuthenticator = "0.0.15"
const val devicesCore = "0.0.15"
const val devicesStorage = "0.0.15"
Expand Down
2 changes: 2 additions & 0 deletions config/owasp-suppression.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<cve>CVE-2015-3415</cve>
<cve>CVE-2015-3414</cve>
<cve>CVE-2015-5895</cve>
<cve>CVE-2023-7104</cve>
</suppress>
<suppress>
<notes><![CDATA[
Expand Down Expand Up @@ -93,6 +94,7 @@
<cve>CVE-2015-3415</cve>
<cve>CVE-2015-3414</cve>
<cve>CVE-2015-5895</cve>
<cve>CVE-2023-7104</cve>
</suppress>

</suppressions>
8 changes: 4 additions & 4 deletions devices-push/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildTypes {
Expand Down Expand Up @@ -83,7 +83,7 @@ dependencies {
testImplementation("androidx.test.ext:junit-ktx:${Version.extJunit}")
testImplementation("org.robolectric:robolectric:4.11.1")
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
testImplementation("io.mockk:mockk:1.13.7")
testImplementation("io.mockk:mockk:1.13.9")
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
14 changes: 7 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
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 @@ -49,12 +49,12 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}

buildFeatures {
Expand All @@ -76,7 +76,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.biometric:biometric:1.2.0-alpha05")
implementation("androidx.activity:activity-compose:1.8.1")
implementation("androidx.activity:activity-compose:1.8.2")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:${Version.archLifecycleVersion}")
implementation("androidx.compose.material:material:${Version.compose}")
implementation("androidx.compose.ui:ui:${Version.compose}")
Expand Down

0 comments on commit 2241579

Please sign in to comment.