From 5876d4a0a0313d27bc509b219d98d8a90c274886 Mon Sep 17 00:00:00 2001 From: Nullptr Date: Sat, 5 Nov 2022 12:00:25 +0800 Subject: [PATCH] Update dependencies & Fix UI previewing --- core | 2 +- manager/build.gradle.kts | 25 +++++++++++++++---------- patch-loader/build.gradle.kts | 2 +- patch/build.gradle.kts | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/core b/core index 65136dc..2ba0d5a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 65136dc5ff07510e8462e792bb394d2365e6ef9c +Subproject commit 2ba0d5a714aea89e530da2ee1e6f63b8f3ffc7d2 diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index 5d7525a..06e4345 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -87,26 +87,31 @@ dependencies { implementation(projects.share.java) val roomVersion = "2.4.3" - val accompanistVersion = "0.26.5-rc" - val composeDestinationsVersion = "1.7.22-beta" + val accompanistVersion = "0.27.0" + val composeDestinationsVersion = "1.7.25-beta" + implementation(platform("androidx.compose:compose-bom:2022.10.00")) + annotationProcessor("androidx.room:room-compiler:$roomVersion") compileOnly("dev.rikka.hidden:stub:2.3.1") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.customview:customview:1.2.0-alpha02") + debugImplementation("androidx.customview:customview-poolingcontainer:1.0.0") + implementation("androidx.activity:activity-compose:1.6.1") + implementation("androidx.compose.material:material-icons-extended") + implementation("androidx.compose.material3:material3") + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.activity:activity-compose:1.6.0") - implementation("androidx.compose.material:material-icons-extended:1.3.0-rc01") - implementation("androidx.compose.material3:material3:1.0.0-rc01") - implementation("androidx.compose.ui:ui:1.3.0-rc01") - implementation("androidx.compose.ui:ui-tooling:1.3.0-rc01") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1") - implementation("androidx.navigation:navigation-compose:2.5.2") + implementation("androidx.navigation:navigation-compose:2.5.3") implementation("androidx.preference:preference:1.2.0") implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.room:room-runtime:$roomVersion") implementation("com.google.accompanist:accompanist-navigation-animation:$accompanistVersion") implementation("com.google.accompanist:accompanist-pager:$accompanistVersion") implementation("com.google.accompanist:accompanist-swiperefresh:$accompanistVersion") - implementation("com.google.android.material:material:1.6.1") - implementation("com.google.code.gson:gson:2.9.1") + implementation("com.google.android.material:material:1.7.0") + implementation("com.google.code.gson:gson:2.10") implementation("dev.rikka.shizuku:api:12.2.0") implementation("dev.rikka.shizuku:provider:12.2.0") implementation("io.github.raamcosta.compose-destinations:core:$composeDestinationsVersion") diff --git a/patch-loader/build.gradle.kts b/patch-loader/build.gradle.kts index 73afef8..577a86a 100644 --- a/patch-loader/build.gradle.kts +++ b/patch-loader/build.gradle.kts @@ -60,5 +60,5 @@ dependencies { implementation(projects.share.android) implementation(projects.share.java) - implementation("com.google.code.gson:gson:2.9.1") + implementation("com.google.code.gson:gson:2.10") } diff --git a/patch/build.gradle.kts b/patch/build.gradle.kts index b7bbedf..9e9ac14 100644 --- a/patch/build.gradle.kts +++ b/patch/build.gradle.kts @@ -23,5 +23,5 @@ dependencies { implementation("commons-io:commons-io:2.11.0") implementation("com.beust:jcommander:1.82") - implementation("com.google.code.gson:gson:2.9.1") + implementation("com.google.code.gson:gson:2.10") }