diff --git a/app/build.gradle b/app/build.gradle index 90c7473..c47f091 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion = '28.0.3' + compileSdkVersion 31 + buildToolsVersion = '31.0.0' defaultConfig { applicationId "deps.mupen64plusae.android.paulscode.mupen64plus_ae_deps" - minSdkVersion 21 - targetSdkVersion 30 + minSdkVersion 23 + targetSdkVersion 31 versionCode 1 versionName "1.0" } @@ -22,7 +22,7 @@ android { path "src/main/cpp/Android.mk" } } - ndkVersion '22.0.7026061' + ndkVersion "23.1.7779620" defaultConfig { externalNativeBuild { @@ -38,5 +38,4 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 48e7880..8b1f3e2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,8 +4,6 @@ + android:supportsRtl="true" /> diff --git a/app/src/main/cpp/Application.mk b/app/src/main/cpp/Application.mk index 790606e..9c0b605 100644 --- a/app/src/main/cpp/Application.mk +++ b/app/src/main/cpp/Application.mk @@ -1,7 +1,2 @@ APP_STL := c++_shared -APP_ABI := armeabi-v7a x86 -# TODO: mips - -APP_PLATFORM := android-19 APP_OPTIM := release -APP_CPPFLAGS += -fexceptions diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml deleted file mode 100644 index 3ab3e9c..0000000 --- a/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - #3F51B5 - #303F9F - #FF4081 - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml deleted file mode 100644 index 5f63f3c..0000000 --- a/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - mupen64plus-ae-deps - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml deleted file mode 100644 index 5885930..0000000 --- a/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/build.gradle b/build.gradle index 2426268..154f3f5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:7.0.4' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9763a40..7a7b592 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/junrar/build.gradle b/junrar/build.gradle index 831a959..21b3a83 100644 --- a/junrar/build.gradle +++ b/junrar/build.gradle @@ -1,19 +1,15 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 31 defaultConfig { - minSdkVersion 19 - targetSdkVersion 27 - versionCode 1 - versionName "1.0" + minSdkVersion 23 + targetSdkVersion 31 } task sourcesJar(type: Jar) { - classifier = 'sources' from android.sourceSets.main.java.srcDirs } }