From 1968bada2f18162785a74908bb9b886cb6e22dbf Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 26 Jan 2026 20:06:39 +0100 Subject: [PATCH 1/8] fix: add backup and data extraction rules --- app/src/main/AndroidManifest.xml | 2 ++ app/src/main/res/xml/backup_rules.xml | 8 ++++++++ app/src/main/res/xml/data_extraction_rules.xml | 9 +++++++++ 3 files changed, 19 insertions(+) create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 632dd54e0..5f9b54204 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,6 +28,8 @@ + + + + + + + diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 000000000..373e59114 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,9 @@ + + + + + + + + + From 7fcb2af6e3875ef5ebcdd7847ad205262885012d Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 26 Jan 2026 20:25:57 +0100 Subject: [PATCH 2/8] fix: suppress android 14+ fg service warnings --- app/src/main/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5f9b54204..ebcf34f04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,9 @@ - + Date: Mon, 26 Jan 2026 20:48:36 +0100 Subject: [PATCH 3/8] chore: bump version --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7327c78bb..3c28503f3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -54,8 +54,8 @@ android { applicationId = "to.bitkit" minSdk = 28 targetSdk = 36 - versionCode = 172 - versionName = "2.0.0-rc.6" + versionCode = 173 + versionName = "2.0.0-rc.7" testInstrumentationRunner = "to.bitkit.test.HiltTestRunner" vectorDrawables { useSupportLibrary = true From d8c5cccacb94ff7a1f0d13ef168ac811dac51267 Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 26 Jan 2026 23:40:23 +0100 Subject: [PATCH 4/8] chore: unify build output naming --- app/build.gradle.kts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3c28503f3..57d6e4459 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -174,12 +174,27 @@ android { } applicationVariants.all { val variant = this + val bitkit = "bitkit" + val flavorName = variant.flavorName + val variantName = variant.buildType.name + val versionCode = defaultConfig.versionCode outputs .map { it as BaseVariantOutputImpl } .forEach { output -> - val apkName = "bitkit-android-${defaultConfig.versionCode}-${variant.name}.apk" + val abi = output.getFilter("ABI") ?: "universal" + val apkName = "$bitkit-$flavorName-$variantName-$versionCode-$abi.apk" output.outputFileName = apkName } + + // Rename AAB bundle + tasks.named( + "sign${variant.name.replaceFirstChar { it.uppercase() }}Bundle", + FinalizeBundleTask::class.java, + ) { + val aabName = "$bitkit-$flavorName-$variantName-$versionCode.aab" + val outputDir = finalBundleFile.asFile.get().parentFile + finalBundleFile.set(File(outputDir, aabName)) + } } } From 3677ba68886723b79fdd241f8d506e7beac7ee95 Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Mon, 26 Jan 2026 23:41:19 +0100 Subject: [PATCH 5/8] chore: setup abi splits --- app/build.gradle.kts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 57d6e4459..9b968d485 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,4 +1,5 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl +import com.android.build.gradle.internal.tasks.FinalizeBundleTask import io.gitlab.arturbosch.detekt.Detekt import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent @@ -163,6 +164,16 @@ android { excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF" } } + splits { + abi { + isEnable = true + reset() + // Only architectures supported by native libs (ldk-node, bitkit-core) + // x86 not supported; x86_64 only for debug/emulator + include("armeabi-v7a", "arm64-v8a") + isUniversalApk = true + } + } testOptions { unitTests { isReturnDefaultValues = true // mockito From ecf4417b8c13ef5329d9721d900bb87fef1691bd Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Tue, 27 Jan 2026 00:31:44 +0100 Subject: [PATCH 6/8] fix: apk name for e2e --- .github/workflows/e2e.yml | 2 +- .github/workflows/e2e_migration.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 30ab6976f..120a90e2f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -57,7 +57,7 @@ jobs: - name: Rename APK run: | - apk=$(find app/build/outputs/apk/dev/debug -name 'bitkit-android-*-devDebug.apk') + apk=$(find app/build/outputs/apk/dev/debug -name 'bitkit-dev-debug-*-universal.apk') mv "$apk" app/build/outputs/apk/dev/debug/bitkit_e2e.apk - name: Upload APK diff --git a/.github/workflows/e2e_migration.yml b/.github/workflows/e2e_migration.yml index a62313be2..c17d59044 100644 --- a/.github/workflows/e2e_migration.yml +++ b/.github/workflows/e2e_migration.yml @@ -53,7 +53,7 @@ jobs: - name: Rename APK run: | - apk=$(find app/build/outputs/apk/dev/debug -name 'bitkit-android-*-devDebug.apk') + apk=$(find app/build/outputs/apk/dev/debug -name 'bitkit-dev-debug-*-universal.apk') mv "$apk" app/build/outputs/apk/dev/debug/bitkit_e2e.apk - name: Upload APK From 9709af945b97813203d9917a4049b189402c3c1d Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Tue, 27 Jan 2026 02:18:25 +0100 Subject: [PATCH 7/8] chore: update ldk-node --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f0021b9ef..9962b072b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,7 +58,7 @@ ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } -ldk-node-android = { module = "com.github.synonymdev.ldk-node:ldk-node-android", version = "v0.7.0-rc.17" } +ldk-node-android = { module = "com.github.synonymdev.ldk-node:ldk-node-android", version = "v0.7.0-rc.18" } lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycle" } lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" } lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } From 521205e1e79924acf0093a3604d177c1d7bc2f5e Mon Sep 17 00:00:00 2001 From: Ovi Trif Date: Tue, 27 Jan 2026 06:11:00 +0100 Subject: [PATCH 8/8] chore: bump version --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9b968d485..5c3f39847 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,8 +55,8 @@ android { applicationId = "to.bitkit" minSdk = 28 targetSdk = 36 - versionCode = 173 - versionName = "2.0.0-rc.7" + versionCode = 174 + versionName = "2.0.0" testInstrumentationRunner = "to.bitkit.test.HiltTestRunner" vectorDrawables { useSupportLibrary = true