diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 6a99fd448..c5e0cde54 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -5,8 +5,8 @@ plugins { group = "com.lighthouse.beep.buildlogic" java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } dependencies { diff --git a/build-logic/convention/src/main/java/com/lighthouse/convention/ProjectConfigurations.kt b/build-logic/convention/src/main/java/com/lighthouse/convention/ProjectConfigurations.kt index 12e869f78..fd5d425f4 100644 --- a/build-logic/convention/src/main/java/com/lighthouse/convention/ProjectConfigurations.kt +++ b/build-logic/convention/src/main/java/com/lighthouse/convention/ProjectConfigurations.kt @@ -6,5 +6,5 @@ object ProjectConfigurations { const val compileSdk = 33 const val minSdk = 23 const val targetSdk = 33 - val javaVer = JavaVersion.VERSION_11 + val javaVer = JavaVersion.VERSION_17 } diff --git a/build.gradle.kts b/build.gradle.kts index 9e5cf2625..c07fa3951 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,4 +23,4 @@ plugins { task("clean", Delete::class) { delete(rootProject.buildDir) -} +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f860a4dfa..f1dedd052 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -androidStudioGradlePlugin = "7.4.0" +androidStudioGradlePlugin = "7.4.2" # AndroidX -activity = "1.6.1" -lifecycle = "2.5.1" +activity = "1.7.0" +lifecycle = "2.6.1" paging = "3.1.1" -room = "2.5.0" +room = "2.5.1" hilt-work = "1.0.0" -work = "2.8.0" +work = "2.8.1" navigation = "2.5.3" compose-compiler = "1.4.0" @@ -42,21 +42,21 @@ mockito = "4.8.0" # AndroidX androidX-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activity" } androidX-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity" } -androidX-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "activity" } +androidX-appcompat = "androidx.appcompat:appcompat:1.6.1" androidX-biometric = "androidx.biometric:biometric:1.1.0" androidX-core-ktx = "androidx.core:core-ktx:1.9.0" androidX-core-splashscreen = "androidx.core:core-splashscreen:1.0.0" androidX-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" -androidX-compose-bom = "androidx.compose:compose-bom:2023.01.00" +androidX-compose-bom = "androidx.compose:compose-bom:2023.03.00" androidX-compose-material = { module = "androidx.compose.material:material" } androidX-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } androidX-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } androidX-compose-icons-extended = { module = "androidx.compose.material:material-icons-extended" } -androidX-compose-activity = "androidx.activity:activity-compose:1.6.1" +androidX-compose-activity = "androidx.activity:activity-compose:1.7.0" androidX-compose-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" } androidX-compose-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" } -androidX-datastore-preferences = "androidx.datastore:datastore-preferences:1.1.0-alpha01" -androidX-fragment-ktx = "androidx.fragment:fragment-ktx:1.5.5" +androidX-datastore-preferences = "androidx.datastore:datastore-preferences:1.1.0-alpha03" +androidX-fragment-ktx = "androidx.fragment:fragment-ktx:1.5.6" androidX-glance-appwidget = "androidx.glance:glance-appwidget:1.0.0-alpha05" androidX-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt-work" } androidX-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt-work" } @@ -93,7 +93,7 @@ gms-play-services-auth = "com.google.android.gms:play-services-auth:20.4.1" gms-play-services-location = "com.google.android.gms:play-services-location:20.0.0" gms-play-services-oss-licences = "com.google.android.gms:play-services-oss-licenses:17.0.0" ## Firebase -firebase-bom = "com.google.firebase:firebase-bom:31.2.3" +firebase-bom = "com.google.firebase:firebase-bom:31.4.0" firebase-auth-ktx = { module = "com.google.firebase:firebase-auth-ktx" } firebase-firestore-ktx = { module = "com.google.firebase:firebase-firestore-ktx" } firebase-storage-ktx = { module = "com.google.firebase:firebase-storage-ktx" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e3c5d931a..6a72a7ee8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Feb 05 00:10:25 KST 2023 +#Wed Apr 05 20:14:24 KST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists