From 68a56e880d5e06f1a34a7c272317666eebfc4888 Mon Sep 17 00:00:00 2001 From: zt64 Date: Sat, 13 Aug 2022 18:37:29 -0400 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 20 +++++++++---------- .../ui/component/about/ContributorsCard.kt | 2 -- .../manager/ui/component/about/TeamCard.kt | 1 - .../ui/component/installer/InstallerDialog.kt | 2 -- .../ui/component/settings/ThemeDialog.kt | 1 - build.gradle.kts | 2 +- 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7fdf04d..cbe3413 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,6 @@ -val accompanistVersion = "0.26.0-alpha" -val composeVersion = "1.3.0-alpha02" -val ktorVersion = "2.0.3" +val accompanistVersion = "0.26.1-alpha" +val composeVersion = "1.3.0-alpha03" +val ktorVersion = "2.1.0" plugins { id("com.android.application") @@ -51,28 +51,28 @@ android { } buildFeatures.compose = true - composeOptions.kotlinCompilerExtensionVersion = "1.3.0-rc01" + composeOptions.kotlinCompilerExtensionVersion = "1.3.0" } dependencies { implementation(fileTree("./libs")) // core dependencies - implementation("androidx.appcompat:appcompat:1.4.2") + implementation("androidx.appcompat:appcompat:1.5.0") implementation("androidx.core:core-ktx:1.8.0") implementation("androidx.core:core-splashscreen:1.0.0") implementation("com.android:zipflinger:7.4.0-alpha09") // implementation("com.github.Aliucord:libzip:1.0.0") // androidX activity - implementation("androidx.activity:activity-compose:1.6.0-alpha05") + implementation("androidx.activity:activity-compose:1.6.0-beta01") // 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-alpha15") - implementation("androidx.paging:paging-compose:1.0.0-alpha15") + implementation("androidx.compose.material3:material3:1.0.0-alpha16") + implementation("androidx.paging:paging-compose:1.0.0-alpha16") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha01") // accompanist dependencies @@ -82,12 +82,12 @@ dependencies { // other dependencies implementation("io.coil-kt:coil-compose:2.1.0") implementation("org.bouncycastle:bcpkix-jdk15on:1.70") - implementation("de.upb.cs.swt:axml:2.1.2") // 2.1.2 is broken btw + implementation("de.upb.cs.swt:axml:2.1.3") // 2.1.2 is broken btw implementation("com.android.tools.build:apksig:7.2.2") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3") // taxi - implementation("com.github.X1nto:Taxi:1.0.0") + implementation("com.github.X1nto:Taxi:1.1.0") // ktor implementation("io.ktor:ktor-client-core:$ktorVersion") diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorsCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorsCard.kt index 6e0777f..f8ee871 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorsCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/ContributorsCard.kt @@ -5,7 +5,6 @@ package com.aliucord.manager.ui.component.about -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.grid.* import androidx.compose.material3.* @@ -17,7 +16,6 @@ import androidx.compose.ui.unit.dp import com.aliucord.manager.R import com.aliucord.manager.model.github.GithubUser -@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable fun ContributorsCard(contributors: List) { ElevatedCard( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/about/TeamCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/TeamCard.kt index 2955af2..242e3df 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/about/TeamCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/about/TeamCard.kt @@ -13,7 +13,6 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.aliucord.manager.R -@OptIn(ExperimentalMaterial3Api::class) @Composable fun TeamCard() = ElevatedCard( modifier = Modifier.wrapContentHeight().fillMaxWidth() diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallerDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallerDialog.kt index 59b93e0..6e270b1 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallerDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallerDialog.kt @@ -5,7 +5,6 @@ package com.aliucord.manager.ui.component.installer -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.material3.* @@ -18,7 +17,6 @@ import com.aliucord.manager.R enum class DownloadMethod { DOWNLOAD, SELECT } -@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable fun InstallerDialog( onDismissRequest: () -> Unit, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeDialog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeDialog.kt index 354b766..737f7b4 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeDialog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/settings/ThemeDialog.kt @@ -18,7 +18,6 @@ import com.aliucord.manager.R import com.aliucord.manager.preferences.Prefs import com.aliucord.manager.ui.theme.Theme -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ThemeDialog( onDismissRequest: () -> Unit, diff --git a/build.gradle.kts b/build.gradle.kts index e5d0916..98094c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.4.0-alpha08") + classpath("com.android.tools.build:gradle:7.4.0-alpha09") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") // NOTE: Do not place your application dependencies here; they belong