[core] Fix R8 bug (#858)

* Fix R8 bug

* Fix riru version

* Update dependencies

close #857
This commit is contained in:
vvb2060 2021-08-07 00:14:42 +08:00 committed by GitHub
parent 2a32132e70
commit 0b00570751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 61 deletions

View File

@ -178,11 +178,11 @@ dependencies {
val okhttpVersion = "4.9.1" val okhttpVersion = "4.9.1"
val navVersion = "2.3.5" val navVersion = "2.3.5"
annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion") annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
implementation("androidx.activity:activity:1.2.3") implementation("androidx.activity:activity:1.3.1")
implementation("androidx.browser:browser:1.3.0") implementation("androidx.browser:browser:1.3.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4") implementation("androidx.constraintlayout:constraintlayout:2.1.0")
implementation("androidx.core:core:1.6.0") implementation("androidx.core:core:1.6.0")
implementation("androidx.fragment:fragment:1.3.5") implementation("androidx.fragment:fragment:1.3.6")
implementation("androidx.navigation:navigation-fragment:$navVersion") implementation("androidx.navigation:navigation-fragment:$navVersion")
implementation("androidx.navigation:navigation-ui:$navVersion") implementation("androidx.navigation:navigation-ui:$navVersion")
implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.recyclerview:recyclerview:1.2.1")

View File

@ -26,7 +26,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.0.0") classpath("com.android.tools.build:gradle:7.0.0")
classpath("org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r") classpath("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5")
} }
} }

View File

@ -55,7 +55,7 @@ val verCode: Int by rootProject.extra
val verName: String by rootProject.extra val verName: String by rootProject.extra
dependencies { dependencies {
implementation("dev.rikka.ndk:riru:${moduleMinRiruVersionName}") implementation("dev.rikka.ndk:riru:26.0.0")
implementation("dev.rikka.ndk.thirdparty:cxx:1.1.0") implementation("dev.rikka.ndk.thirdparty:cxx:1.1.0")
implementation("io.github.vvb2060.ndk:dobby:1.2") implementation("io.github.vvb2060.ndk:dobby:1.2")
implementation("com.android.tools.build:apksig:7.0.0") implementation("com.android.tools.build:apksig:7.0.0")

View File

@ -1,31 +1,8 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
-keep class de.robv.android.xposed.** {*;} -keep class de.robv.android.xposed.** {*;}
-keep class android.** { *; } -keep class android.** { *; }
-keepclassmembers class * implements android.os.Parcelable { -keepclassmembers class * implements android.os.Parcelable {
public static final ** CREATOR; public static final ** CREATOR;
} }
-keepclasseswithmembers class org.lsposed.lspd.models.* { *; }
-keepclasseswithmembers class org.lsposed.lspd.core.Main { -keepclasseswithmembers class org.lsposed.lspd.core.Main {
public static void forkSystemServerPost(android.os.IBinder); public static void forkSystemServerPost(android.os.IBinder);
public static void forkAndSpecializePost(java.lang.String, java.lang.String, android.os.IBinder); public static void forkAndSpecializePost(java.lang.String, java.lang.String, android.os.IBinder);

View File

@ -1,7 +1,4 @@
package android.content.res; package android.content.res;
import android.os.Parcel; public class CompatibilityInfo {
import android.os.Parcelable;
public class CompatibilityInfo implements Parcelable {
} }

View File

@ -1,4 +0,0 @@
package android.os;
public interface Parcelable {
}

View File

@ -1,25 +0,0 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
-keepclasseswithmembers class org.lsposed.lspd.models.* { *; }
-keepclassmembers class * implements android.os.Parcelable {
public static final ** CREATOR;
}