From 2a348867a2ee3df6bc106417d2ece45bd7bf25ab Mon Sep 17 00:00:00 2001 From: sadellie Date: Sun, 13 Nov 2022 12:37:43 +0400 Subject: [PATCH] Bump! --- app/build.gradle.kts | 33 ++++++++++--------- .../unitto/screens/common/UnittoListItem.kt | 2 +- .../screens/setttings/UnitGroupsScreen.kt | 2 +- build.gradle.kts | 6 ++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 396c0fe5..8d12ae39 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,7 +14,7 @@ plugins { id("com.google.firebase.crashlytics") } -val composeVersion = "1.3.0-beta01" +val composeVersion = "1.4.0-alpha01" // Flavor names val playStore = "playStore" @@ -27,6 +27,7 @@ kapt { useBuildCache = true } +@Suppress("UnstableApiUsage") android { namespace = "com.sadellie.unitto" compileSdkVersion = "android-33" @@ -144,28 +145,28 @@ configurations { } dependencies { - implementation("androidx.core:core-ktx:1.8.0") - androidTestImplementation("androidx.test:core:1.4.0") - androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3") + implementation("androidx.core:core-ktx:1.9.0") + androidTestImplementation("androidx.test:core:1.5.0") + androidTestImplementation("androidx.test.ext:junit-ktx:1.1.4") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test:runner:1.4.0") - androidTestImplementation("androidx.test:rules:1.4.0") + androidTestImplementation("androidx.test:runner:1.5.1") + androidTestImplementation("androidx.test:rules:1.5.0") // Compose and navigation implementation("androidx.compose.ui:ui:$composeVersion") implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion") debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion") - implementation("androidx.navigation:navigation-compose:2.5.1") - implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha01") + implementation("androidx.navigation:navigation-compose:2.5.3") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha03") // Material Design 3 - implementation("androidx.compose.material3:material3:1.0.0-beta01") + implementation("androidx.compose.material3:material3:1.1.0-alpha02") // Hilt and navigation implementation("androidx.hilt:hilt-navigation-compose:1.0.0") - kapt("com.google.dagger:dagger-android-processor:2.43.2") - implementation("com.google.dagger:hilt-android:2.43.2") - kapt("com.google.dagger:hilt-compiler:2.43.2") + kapt("com.google.dagger:dagger-android-processor:2.44.1") + implementation("com.google.dagger:hilt-android:2.44.1") + kapt("com.google.dagger:hilt-compiler:2.44.1") // There are a lot of icons implementation("androidx.compose.material:material-icons-extended:$composeVersion") @@ -174,10 +175,10 @@ dependencies { implementation("androidx.datastore:datastore-preferences:1.0.0") // This is for system status bar color - implementation("com.google.accompanist:accompanist-systemuicontroller:0.17.0") + implementation("com.google.accompanist:accompanist-systemuicontroller:0.27.0") // Firebase - "playStoreImplementation"(platform("com.google.firebase:firebase-bom:30.3.2")) + "playStoreImplementation"(platform("com.google.firebase:firebase-bom:31.0.2")) "playStoreImplementation"("com.google.firebase:firebase-analytics-ktx") // Crashlytics and Analytics "playStoreImplementation"("com.google.firebase:firebase-crashlytics-ktx") @@ -188,7 +189,7 @@ dependencies { kapt("androidx.room:room-compiler:2.4.3") // Moshi - implementation("com.squareup.moshi:moshi-kotlin:1.13.0") + implementation("com.squareup.moshi:moshi-kotlin:1.14.0") // Retrofit with Moshi Converter implementation("com.squareup.retrofit2:converter-moshi:2.9.0") @@ -197,7 +198,7 @@ dependencies { implementation("com.github.sadellie:themmo:0.0.5") // ComposeReorderable - implementation("org.burnoutcrew.composereorderable:reorderable:0.9.2") + implementation("org.burnoutcrew.composereorderable:reorderable:0.9.6") // ExprK implementation("com.github.Keelar:ExprK:30c00415a8") diff --git a/app/src/main/java/com/sadellie/unitto/screens/common/UnittoListItem.kt b/app/src/main/java/com/sadellie/unitto/screens/common/UnittoListItem.kt index 5e905942..a59629b2 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/common/UnittoListItem.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/common/UnittoListItem.kt @@ -116,7 +116,7 @@ fun UnittoListItem( onExpandedChange = { dropDownExpanded = it } ) { OutlinedTextField( - modifier = Modifier.widthIn(1.dp), + modifier = Modifier.menuAnchor().widthIn(1.dp), value = allOptions[currentOption] ?: selected.toString(), onValueChange = {}, readOnly = true, diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt index 6cacadef..afbc46d6 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt @@ -70,7 +70,7 @@ fun UnitGroupsScreen( val state = rememberReorderableLazyListState( onMove = viewModel::onMove, - canDragOver = viewModel::canDragOver, + canDragOver = { from, _ -> viewModel.canDragOver(from) }, onDragEnd = { _, _ -> viewModel.onDragEnd() } ) diff --git a/build.gradle.kts b/build.gradle.kts index bfb951c3..362da9d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,15 +5,15 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.2.2") + classpath("com.android.tools.build:gradle:7.3.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") classpath("com.google.dagger:hilt-android-gradle-plugin:2.43") // Google services - classpath("com.google.gms:google-services:4.3.13") + classpath("com.google.gms:google-services:4.3.14") // Crashlytics - classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.1") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle.kts files