Skip to content

Commit 9995aa5

Browse files
gradle(all project): update gradle version
1 parent f32ad25 commit 9995aa5

12 files changed

+41
-40
lines changed

.idea/gradle.xml

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

-12
This file was deleted.

.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
22
apply plugin: "androidx.navigation.safeargs"
33

44
android {
5-
compileSdkVersion 30
6-
buildToolsVersion '30.0.3'
5+
compileSdk 33
6+
buildToolsVersion '33.0.1'
77

88
signingConfigs {
99
debug {
@@ -17,8 +17,8 @@ android {
1717
defaultConfig {
1818
applicationId "com.aof.mcinabox"
1919
minSdkVersion 21
20+
targetSdk 33
2021
//noinspection ExpiredTargetSdkVersion
21-
targetSdkVersion 22
2222
versionCode 8
2323
versionName '0.1.4-p5'
2424
}
@@ -38,20 +38,20 @@ android {
3838

3939
dependencies {
4040
implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
41-
implementation 'androidx.appcompat:appcompat:1.3.1'
42-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
43-
implementation 'com.google.code.gson:gson:2.8.6'
41+
implementation 'androidx.appcompat:appcompat:1.6.0'
42+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
43+
implementation 'com.google.code.gson:gson:2.9.0'
4444
implementation 'com.github.MasayukiSuda:BubbleLayout:v1.2.1'
4545
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
4646
implementation 'com.github.kongqw:AndroidRocker:1.0.1'
4747
implementation 'com.github.QuadFlask:colorpicker:0.0.15'
4848
implementation 'org.apache.commons:commons-compress:1.20'
4949
implementation 'org.tukaani:xz:1.8'
5050
implementation 'androidx.viewpager2:viewpager2:1.0.0'
51-
implementation 'androidx.navigation:navigation-fragment:2.3.5'
52-
implementation 'androidx.navigation:navigation-ui:2.3.5'
53-
implementation 'androidx.preference:preference:1.1.1'
54-
implementation 'com.google.android.material:material:1.4.0'
51+
implementation 'androidx.navigation:navigation-fragment:2.5.3'
52+
implementation 'androidx.navigation:navigation-ui:2.5.3'
53+
implementation 'androidx.preference:preference:1.2.0'
54+
implementation 'com.google.android.material:material:1.8.0'
5555
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
5656
implementation 'com.google.guava:guava:30.0-android'
5757
implementation project(path: ':boat')

app/src/main/AndroidManifest.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="com.aof.mcinabox">
45

56
<uses-feature
67
android:glEsVersion="0x00020000"
78
android:required="true" />
89

9-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
10+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
11+
tools:ignore="ScopedStorage" />
1012
<uses-permission android:name="android.permission.INTERNET" />
1113
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1214

@@ -28,7 +30,8 @@
2830
<activity
2931
android:name=".activity.SplashActivity"
3032
android:screenOrientation="userLandscape"
31-
android:theme="@style/SplashTheme">
33+
android:theme="@style/SplashTheme"
34+
android:exported="true">
3235
<intent-filter>
3336
<action android:name="android.intent.action.MAIN" />
3437

boat/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 30
4+
compileSdkVersion 33
55
buildToolsVersion '30.0.3'
66
ndkVersion '21.3.6528147'
77

88
defaultConfig {
99
minSdkVersion 21
10-
targetSdkVersion 30
10+
targetSdkVersion 33
1111
versionCode 1
1212
versionName "1.0"
1313

@@ -39,6 +39,6 @@ android {
3939

4040
dependencies {
4141
implementation fileTree(dir: 'libs', include: ['*.jar'])
42-
implementation 'androidx.appcompat:appcompat:1.3.1'
42+
implementation 'androidx.appcompat:appcompat:1.6.0'
4343
implementation 'com.google.code.gson:gson:2.8.6'
4444
}

boat/src/main/jni/loadme.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void stub() {
184184
#endif
185185
JNIEXPORT void JNICALL Java_cosine_boat_LoadMe_patchLinker(JNIEnv *env, jclass clazz) {
186186

187-
#ifdef __aarch64__;
187+
#ifdef __aarch64__//;
188188
#define PAGE_START(x) ((void*)((unsigned long)(x) & ~((unsigned long)getpagesize() - 1)))
189189

190190
void* libdl_handle = dlopen("libdl.so", RTLD_LAZY);
@@ -257,7 +257,7 @@ JNIEXPORT jint JNICALL Java_cosine_boat_LoadMe_dlopen(JNIEnv* env, jclass clazz,
257257
char const* lib_name = (*env)->GetStringUTFChars(env ,str1 , 0);
258258

259259
void* handle;
260-
handle = dlopen(lib_name, RTLD_LAZY);
260+
handle = dlopen(lib_name, RTLD_GLOBAL);
261261
if (handle == NULL){
262262
__android_log_print(ANDROID_LOG_ERROR, "Boat", "%s : %s", lib_name, dlerror());
263263
}

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
buildscript {
44
repositories {
55
google()
6-
jcenter()
6+
mavenCentral()
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.2.2'
11-
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5'
10+
classpath 'com.android.tools.build:gradle:7.4.0'
11+
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files
@@ -18,7 +18,7 @@ buildscript {
1818
allprojects {
1919
repositories {
2020
google()
21-
jcenter()
21+
mavenCentral()
2222
maven { url 'https://jitpack.io' }
2323
}
2424
}

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ org.gradle.jvmargs=-Xmx1024m
1717
android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
1919
android.enableJetifier=true
20+
org.gradle.unsafe.configuration-cache=true
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Jul 22 17:09:09 CEST 2021
1+
#Wed Jan 25 20:09:03 CST 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)