diff --git a/.github/workflows/APK_Debug.yml b/.github/workflows/APK_Debug.yml
index a5d600b6..9c4394fd 100644
--- a/.github/workflows/APK_Debug.yml
+++ b/.github/workflows/APK_Debug.yml
@@ -40,10 +40,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK 11.0.5
uses: actions/setup-java@v1.4.3
with:
- java-version: 1.8
+ java-version: 11.0.15
- uses: actions/cache@v2
with:
path: |
@@ -80,10 +80,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK 11.0.5
uses: actions/setup-java@v1.4.3
with:
- java-version: 1.8
+ java-version: 11.0.15
- uses: actions/cache@v2
with:
path: |
@@ -118,10 +118,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK 11.0.5
uses: actions/setup-java@v1.4.3
with:
- java-version: 1.8
+ java-version: 11.0.15
- uses: actions/cache@v2
with:
path: |
diff --git a/.github/workflows/APK_Release_Nightly.yml b/.github/workflows/APK_Release_Nightly.yml
index b412eaa8..c860487b 100644
--- a/.github/workflows/APK_Release_Nightly.yml
+++ b/.github/workflows/APK_Release_Nightly.yml
@@ -44,10 +44,10 @@ jobs:
# format: YYYY-MM-DD
#
# - uses: actions/checkout@v2
-# - name: Set up JDK 1.8
+# - name: Set up JDK 11.0.15
# uses: actions/setup-java@v1.4.3
# with:
-# java-version: 1.8
+# java-version: 11.0.15
# - uses: actions/cache@v2
# with:
# path: |
@@ -95,10 +95,10 @@ jobs:
#暂不知道这玩意是不是取的本地时间
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK 11.0.15
uses: actions/setup-java@v1.4.3
with:
- java-version: 1.8
+ java-version: 11.0.15
- uses: actions/cache@v2
with:
path: |
@@ -143,10 +143,10 @@ jobs:
# with:
# format: YYYY-MM-DD
# - uses: actions/checkout@v2
-# - name: Set up JDK 1.8
+# - name: Set up JDK 11.0.15
# uses: actions/setup-java@v1.4.3
# with:
-# java-version: 1.8
+# java-version: 11.0.15
# - uses: actions/cache@v2
# with:
# path: |
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fb217979..5caef37a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index eb2873e7..1e2d92c1 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66a..ef61796f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..4c6280eb 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,11 @@
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 7ead9fb1..3f1db39d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
apply plugin: "androidx.navigation.safeargs"
android {
- compileSdkVersion 30
- buildToolsVersion '30.0.3'
+ compileSdk 33
+ buildToolsVersion '33.0.1'
signingConfigs {
debug {
@@ -17,8 +17,8 @@ android {
defaultConfig {
applicationId "com.aof.mcinabox"
minSdkVersion 21
+ targetSdk 33
//noinspection ExpiredTargetSdkVersion
- targetSdkVersion 22
versionCode 8
versionName '0.1.4-p5'
}
@@ -38,9 +38,9 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
- implementation 'androidx.appcompat:appcompat:1.3.1'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- implementation 'com.google.code.gson:gson:2.8.6'
+ implementation 'androidx.appcompat:appcompat:1.6.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ implementation 'com.google.code.gson:gson:2.9.0'
implementation 'com.github.MasayukiSuda:BubbleLayout:v1.2.1'
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
implementation 'com.github.kongqw:AndroidRocker:1.0.1'
@@ -48,10 +48,10 @@ dependencies {
implementation 'org.apache.commons:commons-compress:1.20'
implementation 'org.tukaani:xz:1.8'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
- implementation 'androidx.navigation:navigation-fragment:2.3.5'
- implementation 'androidx.navigation:navigation-ui:2.3.5'
- implementation 'androidx.preference:preference:1.1.1'
- implementation 'com.google.android.material:material:1.4.0'
+ implementation 'androidx.navigation:navigation-fragment:2.5.3'
+ implementation 'androidx.navigation:navigation-ui:2.5.3'
+ implementation 'androidx.preference:preference:1.2.0'
+ implementation 'com.google.android.material:material:1.8.0'
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
implementation 'com.google.guava:guava:30.0-android'
implementation project(path: ':boat')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f3949930..a966fd39 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,14 @@
-
+
@@ -28,7 +30,8 @@
+ android:theme="@style/SplashTheme"
+ android:exported="true">
diff --git a/boat/build.gradle b/boat/build.gradle
index cad3c322..456a1dc4 100644
--- a/boat/build.gradle
+++ b/boat/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'
android {
- compileSdkVersion 30
+ compileSdkVersion 33
buildToolsVersion '30.0.3'
ndkVersion '21.3.6528147'
defaultConfig {
minSdkVersion 21
- targetSdkVersion 30
+ targetSdkVersion 33
versionCode 1
versionName "1.0"
@@ -39,6 +39,6 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'androidx.appcompat:appcompat:1.3.1'
+ implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'com.google.code.gson:gson:2.8.6'
}
diff --git a/boat/src/main/jni/loadme.c b/boat/src/main/jni/loadme.c
index 59efb17a..9cbf5476 100644
--- a/boat/src/main/jni/loadme.c
+++ b/boat/src/main/jni/loadme.c
@@ -184,7 +184,7 @@ void stub() {
#endif
JNIEXPORT void JNICALL Java_cosine_boat_LoadMe_patchLinker(JNIEnv *env, jclass clazz) {
-#ifdef __aarch64__;
+#ifdef __aarch64__//;
#define PAGE_START(x) ((void*)((unsigned long)(x) & ~((unsigned long)getpagesize() - 1)))
void* libdl_handle = dlopen("libdl.so", RTLD_LAZY);
@@ -257,7 +257,7 @@ JNIEXPORT jint JNICALL Java_cosine_boat_LoadMe_dlopen(JNIEnv* env, jclass clazz,
char const* lib_name = (*env)->GetStringUTFChars(env ,str1 , 0);
void* handle;
- handle = dlopen(lib_name, RTLD_LAZY);
+ handle = dlopen(lib_name, RTLD_GLOBAL);
if (handle == NULL){
__android_log_print(ANDROID_LOG_ERROR, "Boat", "%s : %s", lib_name, dlerror());
}
diff --git a/build.gradle b/build.gradle
index eb6de628..818b0a7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,12 @@
buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
- classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
+ classpath 'com.android.tools.build:gradle:7.4.0'
+ classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -18,7 +18,7 @@ buildscript {
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
maven { url 'https://jitpack.io' }
}
}
diff --git a/gradle.properties b/gradle.properties
index 17ff947e..63e8edfb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,3 +17,4 @@ org.gradle.jvmargs=-Xmx1024m
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
+org.gradle.unsafe.configuration-cache=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a5527ab..794f79e6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 22 17:09:09 CEST 2021
+#Wed Jan 25 20:09:03 CST 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME