Android tools update

.gitignore

@@ -36,3 +36,8 @@ app/.externalNativeBuild
 app/.cxx
 
 app/app-all-release.apk
+
+#using VSCode now
+org.eclipse.buildship.core.prefs
+.project
+.classpath

.vscode/c_cpp_properties.json

@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/opt/android/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "linux-gcc-x64"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

app/build.gradle

@@ -11,13 +11,13 @@ android {
             keyPassword localProps["droid48.pass"]
         }
     }
-    compileSdkVersion 29
-    ndkVersion "22.1.7171670"
+    compileSdkVersion 31
+    ndkVersion "25.1.8937393"
 
     defaultConfig {
         applicationId "org.ab.x48"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 31
 
         externalNativeBuild {
             cmake {
@@ -34,5 +34,5 @@ android {
 
 }
 dependencies {
-    implementation 'com.getkeepsafe.relinker:relinker:1.4.3'
+    implementation 'com.getkeepsafe.relinker:relinker:1.4.5'
 }

app/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.ab.x48" android:installLocation="auto" android:versionCode="74" android:versionName="1.74">
+      package="org.ab.x48" android:installLocation="auto" android:versionCode="75" android:versionName="1.75">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".X48"
                   android:label="@string/app_name"
-                  android:configChanges="keyboardHidden|orientation" android:launchMode="singleTop"> <!-- |screenSize -->
+                  android:configChanges="keyboardHidden|orientation"
+                  android:launchMode="singleTop"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/org/ab/x48/HPView.java

@@ -380,10 +380,10 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback {
 							boolean antialias = true;
             				
 							systemOptionsPaint = new Paint();
-            				systemOptionsPaint.setTypeface(regularBold);
-            				systemOptionsPaint.setAntiAlias(antialias);
-            				systemOptionsPaint.setTextSize((int) (12f * scale));
-            				systemOptionsPaint.setColor(Color.BLACK);
+							systemOptionsPaint.setTypeface(regularBold);
+							systemOptionsPaint.setAntiAlias(antialias);
+							systemOptionsPaint.setTextSize((int) (12f * scale));
+							systemOptionsPaint.setColor(Color.BLACK);
             				
 							if (x48.isBitmapSkin()) {
 	            				BitmapFactory.Options opts = new BitmapFactory.Options();

app/src/main/java/org/ab/x48/X48.java

@@ -134,7 +134,7 @@ public class X48 extends Activity {
     
     public void checkPrefs() {
     	SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
-		if (mPrefs.getBoolean("blockOrientation", false))
+    	if (mPrefs.getBoolean("blockOrientation", false))
     		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
     	else
     		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);

app/src/main/jni/CMakeLists.txt

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.10.2)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=format-security")
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue May 04 22:27:50 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME