From 95f006682ccae7bc413a346cc62ab7b3d494243e Mon Sep 17 00:00:00 2001 From: Nullptr Date: Fri, 2 Sep 2022 10:30:34 +0800 Subject: [PATCH] Update core and dependencies --- build.gradle.kts | 6 ++-- core | 2 +- gradle.properties | 2 +- manager/build.gradle.kts | 28 +++++++++---------- .../lspatch/ui/component/CenterTopBar.kt | 2 ++ .../lsposed/lspatch/ui/component/SearchBar.kt | 2 +- .../lsposed/lspatch/ui/page/NewPatchScreen.kt | 1 + .../lsposed/lspatch/ui/page/SettingsScreen.kt | 1 + patch-loader/build.gradle.kts | 2 +- patch-loader/src/main/jni/src/config_impl.h | 2 +- patch/build.gradle.kts | 2 +- 11 files changed, 27 insertions(+), 23 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9ce0ba1..e511dcd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,9 +44,9 @@ val coreVerName by extra( .split('"')[1] ) val androidMinSdkVersion by extra(28) -val androidTargetSdkVersion by extra(32) -val androidCompileSdkVersion by extra(32) -val androidCompileNdkVersion by extra("24.0.8215888") +val androidTargetSdkVersion by extra(33) +val androidCompileSdkVersion by extra(33) +val androidCompileNdkVersion by extra("25.0.8775105") val androidBuildToolsVersion by extra("32.0.0") val androidSourceCompatibility by extra(JavaVersion.VERSION_11) val androidTargetCompatibility by extra(JavaVersion.VERSION_11) diff --git a/core b/core index 6ced146..205138f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 6ced1460180d61c647d2ae91e719e8598ca71b94 +Subproject commit 205138f6380bc516bba8473af385b9d734689bec diff --git a/gradle.properties b/gradle.properties index f1a4ddc..58785fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ android.nonTransitiveRClass=true android.enableR8.fullMode=true android.useAndroidX=true -agpVersion=7.2.1 +agpVersion=7.2.2 diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index ea6de3b..a6492a5 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -80,28 +80,28 @@ dependencies { implementation(projects.share.android) implementation(projects.share.java) - val roomVersion = "2.4.2" - val composeDestinationsVersion = "1.6.13-beta" + val roomVersion = "2.4.3" + val composeDestinationsVersion = "1.7.17-beta" annotationProcessor("androidx.room:room-compiler:$roomVersion") compileOnly("dev.rikka.hidden:stub:2.3.1") implementation("dev.rikka.hidden:compat:2.3.1") implementation("androidx.core:core-ktx:1.8.0") - implementation("androidx.activity:activity-compose:1.6.0-alpha05") - implementation("androidx.compose.material:material-icons-extended:1.3.0-alpha01") - implementation("androidx.compose.material3:material3:1.0.0-alpha14") - implementation("androidx.compose.ui:ui:1.3.0-alpha01") - implementation("androidx.compose.ui:ui-tooling:1.3.0-alpha01") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0") - implementation("androidx.navigation:navigation-compose:2.5.0") + implementation("androidx.activity:activity-compose:1.6.0-rc01") + implementation("androidx.compose.material:material-icons-extended:1.3.0-beta01") + implementation("androidx.compose.material3:material3:1.0.0-beta01") + implementation("androidx.compose.ui:ui:1.3.0-beta01") + implementation("androidx.compose.ui:ui-tooling:1.3.0-beta01") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1") + implementation("androidx.navigation:navigation-compose:2.5.1") implementation("androidx.preference:preference:1.2.0") implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.room:room-runtime:$roomVersion") - implementation("com.google.accompanist:accompanist-drawablepainter:0.24.11-rc") - implementation("com.google.accompanist:accompanist-navigation-animation:0.24.11-rc") - implementation("com.google.accompanist:accompanist-pager:0.24.11-rc") - implementation("com.google.accompanist:accompanist-swiperefresh:0.24.11-rc") + implementation("com.google.accompanist:accompanist-drawablepainter:0.26.2-beta") + implementation("com.google.accompanist:accompanist-navigation-animation:0.26.2-beta") + implementation("com.google.accompanist:accompanist-pager:0.26.2-beta") + implementation("com.google.accompanist:accompanist-swiperefresh:0.26.2-beta") implementation("com.google.android.material:material:1.6.1") - implementation("com.google.code.gson:gson:2.9.0") + implementation("com.google.code.gson:gson:2.9.1") implementation("dev.rikka.shizuku:api:12.1.0") implementation("dev.rikka.shizuku:provider:12.1.0") implementation("io.github.raamcosta.compose-destinations:core:$composeDestinationsVersion") diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/component/CenterTopBar.kt b/manager/src/main/java/org/lsposed/lspatch/ui/component/CenterTopBar.kt index 350fabf..68b62e1 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/component/CenterTopBar.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/component/CenterTopBar.kt @@ -1,6 +1,7 @@ package org.lsposed.lspatch.ui.component import androidx.compose.material3.CenterAlignedTopAppBar +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -10,6 +11,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import org.lsposed.lspatch.ui.util.SampleStringProvider +@OptIn(ExperimentalMaterial3Api::class) @Preview @Composable fun CenterTopBar(@PreviewParameter(SampleStringProvider::class, 1) text: String) { diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/component/SearchBar.kt b/manager/src/main/java/org/lsposed/lspatch/ui/component/SearchBar.kt index 91ee333..0c32438 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/component/SearchBar.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/component/SearchBar.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.unit.dp private const val TAG = "SearchBar" -@OptIn(ExperimentalComposeUiApi::class) +@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class) @Composable fun SearchAppBar( title: @Composable () -> Unit, diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt index f75e2fe..b2f4513 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt @@ -144,6 +144,7 @@ fun NewPatchScreen( } } +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun ConfiguringTopBar(onBackClick: () -> Unit) { SmallTopAppBar( diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/SettingsScreen.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/SettingsScreen.kt index 4542dcb..04a6aa0 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/page/SettingsScreen.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/SettingsScreen.kt @@ -53,6 +53,7 @@ fun SettingsScreen() { } } +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun KeyStore() { val context = LocalContext.current diff --git a/patch-loader/build.gradle.kts b/patch-loader/build.gradle.kts index 79e2928..a62eb83 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.0") + implementation("com.google.code.gson:gson:2.9.1") } diff --git a/patch-loader/src/main/jni/src/config_impl.h b/patch-loader/src/main/jni/src/config_impl.h index 8da49f4..3dbd2c7 100644 --- a/patch-loader/src/main/jni/src/config_impl.h +++ b/patch-loader/src/main/jni/src/config_impl.h @@ -24,7 +24,7 @@ #pragma once #include -#include "ConfigBridge.h" +#include "config_bridge.h" namespace lspd { diff --git a/patch/build.gradle.kts b/patch/build.gradle.kts index f00bcd2..d8c9fa2 100644 --- a/patch/build.gradle.kts +++ b/patch/build.gradle.kts @@ -18,5 +18,5 @@ dependencies { implementation("commons-io:commons-io:2.11.0") implementation("com.beust:jcommander:1.82") - implementation("com.google.code.gson:gson:2.9.0") + implementation("com.google.code.gson:gson:2.9.1") }