Skip to content

Commit

Permalink
gradle(all project): update gradle version
Browse files Browse the repository at this point in the history
  • Loading branch information
TSaltedfishKing committed Jan 25, 2023
1 parent f32ad25 commit 9995aa5
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 40 deletions.
6 changes: 2 additions & 4 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
Expand All @@ -38,20 +38,20 @@ 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'
implementation 'com.github.QuadFlask:colorpicker:0.0.15'
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')
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.aof.mcinabox">

<uses-feature
android:glEsVersion="0x00020000"
android:required="true" />

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

Expand All @@ -28,7 +30,8 @@
<activity
android:name=".activity.SplashActivity"
android:screenOrientation="userLandscape"
android:theme="@style/SplashTheme">
android:theme="@style/SplashTheme"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
6 changes: 3 additions & 3 deletions boat/build.gradle
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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'
}
4 changes: 2 additions & 2 deletions boat/src/main/jni/loadme.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
}
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,7 +18,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 9995aa5

Please sign in to comment.