commit ee07c35e53b6aa7993257c89b7272fcd93df33cc
parent 64c800a7244c32ba3be78b07db437d61a4a1f437
Author: Iván Ávalos <avalos@disroot.org>
Date: Sat, 9 May 2026 18:06:27 +0200
[wallet] fix build: bump AGP to support API 37
Diffstat:
6 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.13.2'
+ classpath 'com.android.tools.build:gradle:9.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/donau-verificator/build.gradle b/donau-verificator/build.gradle
@@ -73,18 +73,14 @@ android {
}
packagingOptions {
- // Exclude specific files or directories that might cause conflicts
- exclude 'META-INF/DEPENDENCIES'
- exclude 'META-INF/LICENSE'
- exclude 'META-INF/LICENSE.txt'
- exclude 'META-INF/NOTICE'
- exclude 'META-INF/NOTICE.txt'
- exclude 'META-INF/ASL2.0'
- exclude 'META-INF/*.kotlin_module'
-
- // Merge specific files if needed
- merge 'META-INF/LGPL2.1'
- merge 'META-INF/AL2.0'
+ resources {
+ // Merge specific files if needed
+ merges += ['META-INF/LGPL2.1', 'META-INF/AL2.0']
+ // Exclude specific files or directories that might cause conflicts
+ excludes += ['META-INF/DEPENDENCIES', 'META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/NOTICE', 'META-INF/NOTICE.txt', 'META-INF/ASL2.0', 'META-INF/*.kotlin_module']
+ }
+
+
// Exclude everything under META-INF to avoid conflicts
resources.excludes.add("META-INF/**/*")
diff --git a/gradle.properties b/gradle.properties
@@ -22,3 +22,13 @@ android.nonTransitiveRClass=false
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.mpp.stability.nowarn=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
#Wed Feb 25 13:18:29 CET 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -95,6 +95,7 @@ android {
packagingOptions {
jniLibs {
keepDebugSymbols += ['**/*.so']
+ useLegacyPackaging true
}
resources {
excludes += ['META-INF/*.kotlin_module']
diff --git a/wallet/src/main/AndroidManifest.xml b/wallet/src/main/AndroidManifest.xml
@@ -36,7 +36,6 @@
<application
android:name=".WalletApp"
android:allowBackup="true"
- android:extractNativeLibs="true"
android:fullBackupContent="@xml/backup_descriptor"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"