SDK 34 adaptations

- build.gradle upgrades - Code adaptations to remove switch cases to resource IDs - Fix import of resource IDs from library level resources - Minimum version requirement set to LOLLIPOP
TeamAmaze · Jul 10, 2024 · 0350790 · 0350790
1 parent bdc86af
commit 0350790
Show file tree

Hide file tree

Showing 97 changed files with 694 additions and 782 deletions.
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Check formatting using spotless
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -31,11 +31,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v3
         with:

diff --git a/.github/workflows/android-debug-artifact-ondemand.yml b/.github/workflows/android-debug-artifact-ondemand.yml
@@ -35,11 +35,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{fromJson(steps.request.outputs.data).head.repo.full_name}}
           ref: ${{fromJson(steps.request.outputs.data).head.ref}}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v3
         with:

diff --git a/.github/workflows/android-debug-artifact-release.yml b/.github/workflows/android-debug-artifact-release.yml
@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v3
         with:

diff --git a/.github/workflows/android-feature.yml b/.github/workflows/android-feature.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Check formatting using spotless
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v3
         with:

diff --git a/.github/workflows/android-main.yml b/.github/workflows/android-main.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Check formatting using spotless
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -34,11 +34,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -71,10 +71,11 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - name: Java 15
+      - name: Java 17
         uses: actions/setup-java@v4
         with:
-          java-version: 15
+          distribution: "temurin"
+          java-version: 17
       - name: Gradle cache
         uses: gradle/actions/setup-gradle@v3
       - name: AVD cache

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'com.hiya.jacoco-android'
+apply plugin: "com.mxalbert.gradle.jacoco-android"
 apply plugin: "com.starter.easylauncher"
 apply plugin: 'com.google.devtools.ksp'
 
@@ -15,7 +15,6 @@ android {
         }
     }
 
-
     defaultConfig {
         applicationId "com.amaze.filemanager"
         minSdkVersion libs.versions.minSdk.get().toInteger()
@@ -95,12 +94,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     testOptions {
@@ -262,7 +261,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
 
 configurations.configureEach {
@@ -291,6 +290,8 @@ tasks.register('supportOldLangCodes')
         include('strings.xml')
     }
     supportOldLangCodes.dependsOn copyTask
+    rootProject.tasks.named('spotlessJava').configure { dependsOn copyTask }
+    rootProject.tasks.named('spotlessKotlin').configure { dependsOn copyTask }
 }
 
 project.afterEvaluate {
@@ -304,14 +305,6 @@ jacoco {
     toolVersion = libs.versions.jacoco.get()
 }
 
-tasks.withType(JacocoReport).configureEach {
-    reports {
-        csv.required.set(false)
-        html.required.set(true)
-        xml.required.set(true)
-    }
-}
-
 tasks.withType(Test).configureEach {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']

diff --git a/app/proguard.cfg b/app/proguard.cfg
@@ -98,6 +98,13 @@
 -keep class org.bouncycastle.jcajce.spec.* {*;}
 -keep class org.bouncycastle.jce.** {*;}
 
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.bouncycastle.asn1.ASN1ApplicationSpecific
+-dontwarn org.bouncycastle.asn1.DERApplicationSpecific
+-dontwarn org.conscrypt.**
+-dontwarn org.openjsse.**
+-dontwarn sun.security.x509.X509Key
+
 -dontwarn javax.naming.**
 
 #From here sshj. We are not using GSSAPI to connect to SSH

diff --git a/app/src/main/java/com/amaze/filemanager/crashreport/ErrorActivity.java b/app/src/main/java/com/amaze/filemanager/crashreport/ErrorActivity.java
@@ -263,20 +263,14 @@ public boolean onCreateOptionsMenu(final Menu menu) {
 
   @Override
   public boolean onOptionsItemSelected(final MenuItem item) {
-    final int id = item.getItemId();
-    switch (id) {
-      case android.R.id.home:
-        goToReturnActivity();
-        break;
-      case R.id.menu_item_share_error:
-        final Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_SEND);
-        intent.putExtra(Intent.EXTRA_TEXT, buildMarkdown());
-        intent.setType("text/plain");
-        startActivity(Intent.createChooser(intent, getString(R.string.share)));
-        break;
-      default:
-        break;
+    if (item.getItemId() == android.R.id.home) {
+      goToReturnActivity();
+    } else if (item.getItemId() == R.id.menu_item_share_error) {
+      final Intent intent = new Intent();
+      intent.setAction(Intent.ACTION_SEND);
+      intent.putExtra(Intent.EXTRA_TEXT, buildMarkdown());
+      intent.setType("text/plain");
+      startActivity(Intent.createChooser(intent, getString(R.string.share)));
     }
     return false;
   }