Merge branch 'fork-maintainers:iceraven' into iceraven

Author: Burhanverse

.github/workflows/ci.yml

@@ -82,12 +82,6 @@ jobs:
           path: gradle/build/app/outputs/apk/fenix/forkRelease/app-fenix-armeabi-v7a-forkRelease.apk
           name: ${{ env.VERSION_NAME }}-browser-armeabi-v7a-forkRelease.apk
 
-      - name: Upload x86 apk
-        uses: actions/upload-artifact@v4
-        with:
-          path: gradle/build/app/outputs/apk/fenix/forkRelease/app-fenix-x86-forkRelease.apk
-          name: ${{ env.VERSION_NAME }}-browser-x86-forkRelease.apk
-
       - name: Upload x86_64 apk
         uses: actions/upload-artifact@v4
         with:

.github/workflows/release.yml

@@ -126,17 +126,6 @@ jobs:
           asset_name: ${{ github.event.ref }}-browser-armeabi-v7a-forkRelease.apk
           asset_content_type: application/vnd.android.package-archive
 
-      - name: Upload x86 apk
-        if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: gradle/build/app/outputs/apk/fenix/forkRelease/app-fenix-x86-forkRelease.apk
-          asset_name: ${{ github.event.ref }}-browser-x86-forkRelease.apk
-          asset_content_type: application/vnd.android.package-archive
-
       - name: Upload x86_64 apk
         if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"
         uses: actions/upload-release-asset@v1

android-components

@@ -304,6 +304,13 @@ android {
         }
     }
 
+    // Exclude native libraries for unsupported architectures from third-party dependencies
+    packagingOptions {
+        jniLibs {
+            excludes += ["**/armeabi/*.so", "**/mips/*.so", "**/mips64/*.so", "**/x86/*.so"]
+        }
+    }
+
     lint {
         lintConfig = file("lint.xml")
         baseline = file("lint-baseline.xml")
@@ -327,10 +334,6 @@ android {
         compose = true
     }
 
-    compileOptions {
-        coreLibraryDesugaringEnabled = true
-    }
-
     namespace = 'org.mozilla.fenix'
 }
 
@@ -577,13 +580,7 @@ nimbus {
             ? gradle.getProperty('localProperties.autoPublish.application-services.dir') : null
 }
 
-tasks.withType(KotlinCompile).configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
-}
-
 dependencies {
-    coreLibraryDesugaring libs.desugar.jdk.libs
-
     // We pick up JNA transitively by way of Glean, which is currently on version 5.14.0.
     // However, we need to force version 5.17.0 due to Google Play's 16KB page size requirement.
     // JNA 5.15.0+ crashes on Android <7, however, so it can't be bumped in Glean at this time.
@@ -688,6 +685,7 @@ dependencies {
     implementation platform(libs.androidx.compose.bom)
     implementation libs.androidx.compose.animation
     implementation libs.androidx.compose.foundation
+    implementation libs.androidx.compose.material.icons
     implementation libs.androidx.compose.material3
     implementation libs.androidx.compose.material3.adaptive
     implementation libs.androidx.compose.material3.adaptivelayout