From 39383229d1f6f860a125ad72264528bd4e1a9835 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Thu, 20 Jul 2023 18:35:53 -0700 Subject: [PATCH] Update dependencies Close #7128 --- app/build.gradle.kts | 10 +++++----- .../lifecycle/ProcessLifecycleAccessor.java | 12 ------------ .../main/java/com/topjohnwu/magisk/core/App.kt | 1 - .../magisk/core/ProcessLifecycleAccessor.java | 15 +++++++++++++++ .../topjohnwu/magisk/ui/flash/FlashViewModel.kt | 4 ++-- buildSrc/build.gradle.kts | 5 +++-- gradle.properties | 4 ++-- 7 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 app/src/main/java/androidx/lifecycle/ProcessLifecycleAccessor.java create mode 100644 app/src/main/java/com/topjohnwu/magisk/core/ProcessLifecycleAccessor.java diff --git a/app/build.gradle.kts b/app/build.gradle.kts index be86f5b49..4f712a8ad 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -74,13 +74,13 @@ dependencies { implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7") implementation("com.github.topjohnwu:lz4-java:1.7.1") implementation("com.jakewharton.timber:timber:5.0.1") - implementation("org.bouncycastle:bcpkix-jdk18on:1.73") + implementation("org.bouncycastle:bcpkix-jdk18on:1.75") implementation("dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0") implementation("dev.rikka.rikkax.insets:insets:1.3.0") implementation("dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1") implementation("io.noties.markwon:core:4.6.2") - val vLibsu = "5.1.0" + val vLibsu = "5.2.0" implementation("com.github.topjohnwu.libsu:core:${vLibsu}") implementation("com.github.topjohnwu.libsu:service:${vLibsu}") implementation("com.github.topjohnwu.libsu:nio:${vLibsu}") @@ -99,12 +99,12 @@ dependencies { implementation("com.squareup.moshi:moshi:${vMoshi}") kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}") - val vRoom = "2.5.1" + val vRoom = "2.5.2" implementation("androidx.room:room-runtime:${vRoom}") implementation("androidx.room:room-ktx:${vRoom}") kapt("androidx.room:room-compiler:${vRoom}") - val vNav = "2.5.3" + val vNav = "2.6.0" implementation("androidx.navigation:navigation-fragment-ktx:${vNav}") implementation("androidx.navigation:navigation-ui-ktx:${vNav}") @@ -113,7 +113,7 @@ dependencies { implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.recyclerview:recyclerview:1.3.0") - implementation("androidx.fragment:fragment-ktx:1.5.7") + implementation("androidx.fragment:fragment-ktx:1.6.0") implementation("androidx.transition:transition:1.4.1") implementation("androidx.core:core-ktx:1.10.1") implementation("androidx.core:core-splashscreen:1.0.1") diff --git a/app/src/main/java/androidx/lifecycle/ProcessLifecycleAccessor.java b/app/src/main/java/androidx/lifecycle/ProcessLifecycleAccessor.java deleted file mode 100644 index f69950d04..000000000 --- a/app/src/main/java/androidx/lifecycle/ProcessLifecycleAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package androidx.lifecycle; - -import android.content.Context; - -import androidx.annotation.NonNull; - -public class ProcessLifecycleAccessor { - public static void init(@NonNull Context context) { - LifecycleDispatcher.init(context); - ProcessLifecycleOwner.init(context); - } -} diff --git a/app/src/main/java/com/topjohnwu/magisk/core/App.kt b/app/src/main/java/com/topjohnwu/magisk/core/App.kt index b6cf8155c..5797f46c1 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/App.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/App.kt @@ -5,7 +5,6 @@ import android.app.Application import android.content.Context import android.content.res.Configuration import android.os.Bundle -import androidx.lifecycle.ProcessLifecycleAccessor import com.topjohnwu.magisk.StubApk import com.topjohnwu.magisk.core.di.ServiceLocator import com.topjohnwu.magisk.core.utils.DispatcherExecutor diff --git a/app/src/main/java/com/topjohnwu/magisk/core/ProcessLifecycleAccessor.java b/app/src/main/java/com/topjohnwu/magisk/core/ProcessLifecycleAccessor.java new file mode 100644 index 000000000..f0cd7e287 --- /dev/null +++ b/app/src/main/java/com/topjohnwu/magisk/core/ProcessLifecycleAccessor.java @@ -0,0 +1,15 @@ +package com.topjohnwu.magisk.core; + +import android.content.Context; + +import androidx.annotation.NonNull; +import androidx.lifecycle.LifecycleDispatcher; +import androidx.lifecycle.ProcessLifecycleOwner; + +// Use Java to bypass Kotlin internal visibility modifier +public class ProcessLifecycleAccessor { + public static void init(@NonNull Context context) { + LifecycleDispatcher.init(context); + ProcessLifecycleOwner.init$lifecycle_process_release(context); + } +} diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt index 7be6bd43a..4e4622dca 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt @@ -5,7 +5,7 @@ import androidx.databinding.Bindable import androidx.databinding.ObservableArrayList import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import androidx.lifecycle.viewModelScope import com.topjohnwu.magisk.BR import com.topjohnwu.magisk.R @@ -34,7 +34,7 @@ class FlashViewModel : BaseViewModel() { private val _state = MutableLiveData(State.FLASHING) val state: LiveData get() = _state - val flashing = Transformations.map(state) { it == State.FLASHING } + val flashing = state.map { it == State.FLASHING } @get:Bindable var showReboot = Info.isRooted diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a004f003b..2ad542a88 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,9 +16,10 @@ gradlePlugin { } dependencies { - implementation(kotlin("gradle-plugin", "1.8.21")) + // Cannot upgrade to 1.9.0: https://issuetracker.google.com/issues/236612358#comment19 + implementation(kotlin("gradle-plugin", "1.8.22")) implementation("com.android.tools.build:gradle:8.0.2") - implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3") + implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0") implementation("org.lsposed.lsparanoid:gradle-plugin:0.5.2") implementation("org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r") } diff --git a/gradle.properties b/gradle.properties index aeffff7a1..93a8e74c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m -org.gradle.jvmargs=-Xmx2560m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2560m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit @@ -23,7 +23,7 @@ org.gradle.caching=true # Android android.useAndroidX=true android.injected.testOnly=false -android.nonTransitiveRClass=true +android.nonFinalResIds=false # Magisk magisk.stubVersion=36