diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aff1531d..84c60b57 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,7 +14,7 @@ plugins { id("com.google.firebase.crashlytics") } -val composeVersion = "1.2.0-beta03" +val composeVersion = "1.3.0-alpha02" // Flavor names val playStore = "playStore" @@ -126,7 +126,7 @@ android { shaders = false } composeOptions { - kotlinCompilerExtensionVersion = composeVersion + kotlinCompilerExtensionVersion = "1.3.0-rc01" } packagingOptions { jniLibs.excludes.add("META-INF/licenses/**") @@ -155,16 +155,16 @@ dependencies { 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.0") + implementation("androidx.navigation:navigation-compose:2.5.1") // Material Design 3 - implementation("androidx.compose.material3:material3:1.0.0-alpha14") + implementation("androidx.compose.material3:material3:1.0.0-alpha15") // Hilt and navigation implementation("androidx.hilt:hilt-navigation-compose:1.0.0") - kapt("com.google.dagger:dagger-android-processor:2.42") - implementation("com.google.dagger:hilt-android:2.42") - kapt("com.google.dagger:hilt-compiler:2.42") + kapt("com.google.dagger:dagger-android-processor:2.43") + implementation("com.google.dagger:hilt-android:2.43") + kapt("com.google.dagger:hilt-compiler:2.43") // There are a lot of icons implementation("androidx.compose.material:material-icons-extended:$composeVersion") @@ -182,9 +182,9 @@ dependencies { "playStoreImplementation"("com.google.firebase:firebase-crashlytics-ktx") // Room - implementation("androidx.room:room-runtime:2.4.2") - implementation("androidx.room:room-ktx:2.4.2") - kapt("androidx.room:room-compiler:2.4.2") + implementation("androidx.room:room-runtime:2.4.3") + implementation("androidx.room:room-ktx:2.4.3") + kapt("androidx.room:room-compiler:2.4.3") // Moshi implementation("com.squareup.moshi:moshi-kotlin:1.13.0") @@ -193,5 +193,5 @@ dependencies { implementation("com.squareup.retrofit2:converter-moshi:2.9.0") // Themmo - implementation("com.github.sadellie:themmo:0.0.2") + implementation("com.github.sadellie:themmo:0.0.3") } \ No newline at end of file diff --git a/app/src/main/java/com/sadellie/unitto/screens/common/UnittoLargeTopAppBar.kt b/app/src/main/java/com/sadellie/unitto/screens/common/UnittoLargeTopAppBar.kt index 87180d50..8b8d794e 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/common/UnittoLargeTopAppBar.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/common/UnittoLargeTopAppBar.kt @@ -24,7 +24,7 @@ import androidx.compose.material3.LargeTopAppBar import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberTopAppBarScrollState +import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll @@ -44,7 +44,7 @@ fun UnittoLargeTopAppBar( ) { val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior( rememberSplineBasedDecay(), - rememberTopAppBarScrollState() + rememberTopAppBarState() ) Scaffold( modifier = Modifier diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt index 563d4d5f..34a69488 100644 --- a/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt +++ b/app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt @@ -25,7 +25,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.Scaffold import androidx.compose.material3.TopAppBarDefaults -import androidx.compose.material3.rememberTopAppBarScrollState +import androidx.compose.material3.rememberTopAppBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier @@ -69,7 +69,7 @@ private fun BasicUnitListScreen( title: String, ) { val uiState = viewModel.uiState - val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarScrollState()) + val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState()) val focusManager = LocalFocusManager.current val chipsRowLazyListState = rememberLazyListState() diff --git a/build.gradle.kts b/build.gradle.kts index ccbed4be..4845f879 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,14 +6,14 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:7.2.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21") - classpath("com.google.dagger:hilt-android-gradle-plugin:2.40.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.10") + classpath("com.google.gms:google-services:4.3.13") // Crashlytics - classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.0") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.1") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle.kts files