From 4a611cd1e12ef1c3866c806bbd63a002e48df20a Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 10 Jun 2024 22:57:03 -0400 Subject: [PATCH] chore: bump dependencies --- .gitignore | 3 +++ app/build.gradle | 31 ++++++++++++++++--------------- build.gradle | 2 +- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index f68bb11..52192f6 100644 --- a/.gitignore +++ b/.gitignore @@ -122,6 +122,9 @@ $RECYCLE.BIN/ # Java class files +# Kotlin compiler +.kotlin/ + # Generated files bin/ gen/ diff --git a/app/build.gradle b/app/build.gradle index e5cce6a..ec6bf4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id 'com.android.application' id 'kotlin-android' @@ -41,13 +43,6 @@ android { proguardFiles 'proguard-base.pro', 'proguard-rules.pro' } } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { compose true } @@ -75,14 +70,14 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.13.1' - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.activity:activity-compose:1.9.0' - implementation "androidx.navigation:navigation-compose:2.8.0-beta01" + implementation "androidx.navigation:navigation-compose:2.8.0-beta02" implementation "com.github.topjohnwu.libsu:core:5.0.4" implementation 'com.squareup.logcat:logcat:0.1' - implementation 'com.google.android.gms:play-services-oss-licenses:17.0.1' + implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0' implementation 'com.github.KieronQuinn:MonetCompat:0.4.1' - implementation "io.github.fornewid:material-motion-compose-core:1.2.0" + implementation "io.github.fornewid:material-motion-compose-core:1.2.1" implementation platform("dev.chrisbanes.compose:compose-bom:$compose_bom_version") implementation "androidx.compose.ui:ui" @@ -102,9 +97,9 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - def lifecycle_version = "2.8.0" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" + def lifecycle_version = "2.8.1" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version" implementation "androidx.datastore:datastore:1.1.1" @@ -127,10 +122,16 @@ protobuf { } } +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + kotlin { compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + freeCompilerArgs.addAll( - "-opt-in=kotlin.RequiresOptIn", "-opt-in=androidx.compose.material.ExperimentalMaterialApi", "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi", diff --git a/build.gradle b/build.gradle index 6c45655..1451286 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:8.4.1' + classpath 'com.android.tools.build:gradle:8.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6' classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'