Upgrade dependencies

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "app/src/main/cpp/external/Dobby"]
 	path = app/src/main/cpp/external/Dobby
-	url = git@github.com:jmpews/Dobby.git
+	url = git@github.com:LSPosed/Dobby.git

app/build.gradle

@@ -2,12 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     namespace 'com.shatyuka.zhiliao'
-    compileSdk 33
-    buildToolsVersion '33.0.2'
+    compileSdk 34
     defaultConfig {
         applicationId "com.shatyuka.zhiliao"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         ndkVersion "25.2.9519653"
         versionCode appVerCode.toInteger()
         versionName appVerName
@@ -79,6 +78,7 @@ android {
     packagingOptions {
         jniLibs {
             excludes += ['META-INF/**', 'kotlin/**', 'google/**']
+            useLegacyPackaging false
         }
         resources {
             excludes += ['META-INF/**', 'kotlin/**', 'google/**', '**.bin']

app/src/main/AndroidManifest.xml

@@ -6,7 +6,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:extractNativeLibs="false"
         android:multiArch="true">
 
         <meta-data

app/src/main/cpp/zhiliao.cpp

@@ -20,11 +20,13 @@ FILE *fake_fopen(const char *filename, const char *mode) {
     return result;
 }
 
+#define PAGE_ALIGN(address, page_size) ((address) & (-(page_size)))
+
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_shatyuka_zhiliao_MainHook_initNative(JNIEnv *env, jobject) {
-    auto pagesize = sysconf(_SC_PAGE_SIZE);
-    auto addr = ((uintptr_t)fopen) & (-pagesize);
-    mprotect((void*)addr, pagesize, PROT_READ | PROT_WRITE | PROT_EXEC);
-    DobbyHook((void*)fopen, (void*)fake_fopen, (void**)&orig_fopen);
+    const auto page_size = sysconf(_SC_PAGE_SIZE);
+    const auto aligned = PAGE_ALIGN((uintptr_t)fopen, page_size);
+    mprotect((void*)aligned, page_size, PROT_READ | PROT_WRITE | PROT_EXEC);
+    DobbyHook((void*)fopen, (dobby_dummy_func_t)fake_fopen, (dobby_dummy_func_t*)&orig_fopen);
 }

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -12,6 +12,8 @@ android.enableAppCompileTimeRClass=true
 android.enableR8.fullMode=true
 android.experimental.enableNewResourceShrinker=true
 android.experimental.enableNewResourceShrinker.preciseShrinking=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Mar 14 23:38:36 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME