From d730de27b7034a57c5f6b5ea819aaaac326a8f6b Mon Sep 17 00:00:00 2001 From: LoveSy Date: Tue, 24 Aug 2021 21:58:08 +0800 Subject: [PATCH] Merge core --- .../main/java/org/lsposed/lspatch/loader/LSPApplication.java | 5 ----- build.gradle | 4 ++-- core | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java b/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java index f366222..caee6a0 100644 --- a/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java +++ b/app/src/main/java/org/lsposed/lspatch/loader/LSPApplication.java @@ -693,11 +693,6 @@ public class LSPApplication extends ApplicationServiceClient { return new File(Environment.getDataDirectory(), "data/" + packageName + "/shared_prefs/").getAbsolutePath(); } - @Override - public ParcelFileDescriptor getModuleLogger() { - return null; - } - @Override public Bundle requestRemotePreference(String packageName, int userId, IBinder callback) { return null; diff --git a/build.gradle b/build.gradle index 6ff3f48..0773507 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.1.0-alpha09' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21" } } @@ -16,7 +16,7 @@ buildscript { // sync from https://github.com/LSPosed/LSPosed/blob/master/build.gradle.kts ext { androidCompileSdkVersion = 31 - androidCompileNdkVersion = "22.1.7171670" + androidCompileNdkVersion = "23.0.7599858" androidBuildToolsVersion = "31.0.0" androidMinSdkVersion = 27 androidTargetSdkVersion = 30 diff --git a/core b/core index 89b6ddb..52c8d1c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 89b6ddbb68c1256284153299036b0cfa8b887d9a +Subproject commit 52c8d1c89d658cf4083ec528caa12a7fd0113638 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da730f1..e2275fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Aug 07 16:09:17 CST 2021 +#Tue Aug 24 21:50:17 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME