From b9a8c92c129d9aabc80b265b4c2ee8b36b92dbe0 Mon Sep 17 00:00:00 2001 From: zt64 Date: Tue, 2 Aug 2022 16:33:04 -0400 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 20 +++++++++---------- .../aliucord/manager/ui/component/AppBar.kt | 1 + .../manager/ui/component/PluginsList.kt | 1 + .../manager/ui/screen/SettingsScreen.kt | 1 + build.gradle.kts | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index adce535..05c4bf7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,12 +1,12 @@ -val accompanistVersion = "0.24.13-rc" -val composeVersion = "1.3.0-alpha01" +val accompanistVersion = "0.26.0-alpha" +val composeVersion = "1.3.0-alpha02" val ktorVersion = "2.0.3" plugins { id("com.android.application") id("kotlin-android") - id("com.google.devtools.ksp") version "1.7.0-1.0.6" - kotlin("plugin.serialization") version "1.6.21" + id("com.google.devtools.ksp") version "1.7.10-1.0.6" + kotlin("plugin.serialization") version "1.7.10" } android { @@ -51,7 +51,7 @@ android { } buildFeatures.compose = true - composeOptions.kotlinCompilerExtensionVersion = "1.2.0" + composeOptions.kotlinCompilerExtensionVersion = "1.3.0-rc01" } dependencies { @@ -60,15 +60,15 @@ dependencies { // core dependencies implementation("androidx.appcompat:appcompat:1.4.2") implementation("androidx.core:core-ktx:1.8.0") - implementation("androidx.core:core-splashscreen:1.0.0-rc01") - implementation("com.android:zipflinger:7.4.0-alpha07") + implementation("androidx.core:core-splashscreen:1.0.0") + implementation("com.android:zipflinger:7.4.0-alpha08") // implementation("com.github.Aliucord:libzip:1.0.0") // compose dependencies implementation("androidx.compose.ui:ui:${composeVersion}") implementation("androidx.compose.ui:ui-tooling:${composeVersion}") implementation("androidx.compose.material:material-icons-extended:${composeVersion}") - implementation("androidx.compose.material3:material3:1.0.0-alpha14") + implementation("androidx.compose.material3:material3:1.0.0-alpha15") implementation("androidx.paging:paging-compose:1.0.0-alpha15") // accompanist dependencies @@ -76,8 +76,8 @@ dependencies { implementation("com.google.accompanist:accompanist-permissions:${accompanistVersion}") // compose destinations - implementation("io.github.raamcosta.compose-destinations:core:1.6.12-beta") - ksp("io.github.raamcosta.compose-destinations:ksp:1.6.12-beta") + implementation("io.github.raamcosta.compose-destinations:core:1.7.15-beta") + ksp("io.github.raamcosta.compose-destinations:ksp:1.7.15-beta") // other dependencies implementation("io.coil-kt:coil-compose:2.1.0") diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/AppBar.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/AppBar.kt index a956834..3ad440c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/AppBar.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/AppBar.kt @@ -39,6 +39,7 @@ private val Destination.title AboutScreenDestination -> R.string.about } +@OptIn(ExperimentalMaterial3Api::class) @Composable fun AppBar(navController: NavController) { val destination = navController.currentBackStackEntryAsState().value?.appDestination() ?: HomeScreenDestination diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/PluginsList.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/PluginsList.kt index 304531b..39eda98 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/PluginsList.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/PluginsList.kt @@ -26,6 +26,7 @@ import com.aliucord.manager.model.Plugin import com.aliucord.manager.ui.component.plugins.Changelog import com.aliucord.manager.ui.component.plugins.PluginCard +@OptIn(ExperimentalMaterial3Api::class) @Composable fun PluginsList() = Column( modifier = Modifier.fillMaxSize(), diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt index 8945c5e..6e07671 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt @@ -23,6 +23,7 @@ import com.aliucord.manager.ui.component.settings.* import com.aliucord.manager.ui.viewmodel.SettingsViewModel import com.ramcosta.composedestinations.annotation.Destination +@OptIn(ExperimentalMaterial3Api::class) @Destination @Composable fun SettingsScreen() = Column( diff --git a/build.gradle.kts b/build.gradle.kts index 0f4dd14..e5d0916 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:7.4.0-alpha08") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle.kts files