Increment to version 4.0.29

Blockstream · May 22, 2024 · a5fe83e · a5fe83e
1 parent a14807e
commit a5fe83e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -73,6 +73,7 @@ production_fdroid:
   script:
     - cd $CI_PROJECT_DIR
     - echo $ANDROID_KEYSTORE_BASE64 | base64 -d > keystore.jks
+    - ./prepare_fdroid.sh
     - ./gradlew useBlockstreamKeys
     - ./gradlew assembleProductionFDroidRelease
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [4.0.29] - 2024-05-23
+
+### Changed
+- Bump Breez to version 0.4.1
+
+### Fixed
+- Fix F-Droid dependency issue
+
 ## [4.0.28] - 2024-05-13
 
 ### Added

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -133,7 +133,8 @@ kotlin {
 
             /**  --- Breez FDroid ----------------------------------------------------------------------- */
             // Temp fix for FDroid breez dependencies
-            // api(libs.breez.sdk.android)
+            // api(libs.breez.sdk.android.get().toString()) { exclude(group = "net.java.dev.jna", module = "jna") }
+            // implementation("${libs.jna.get()}@aar")
             /** ----------------------------------------------------------------------------------------- */
         }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,12 +5,12 @@ kotlinx-coroutines = "1.8.1"
 kotlinx-datetime = "0.5.0"
 kotlinx-serialization = "1.6.3"
 kotlin-ksp = "1.9.23-1.0.19"
-android-gradle-plugin = "8.4.0"
+android-gradle-plugin = "8.4.1"
 androidCompileSdk = "34"
 androidTargetSdk = "34"
 androidMinSdk = "24"
 buildTools = "34.0.0"
-breez = "0.4.1-rc2"
+breez = "0.4.1"
 activity-ktx = "1.9.0"
 androidx-junit = "1.1.5"
 annotation = "1.7.1"
@@ -82,6 +82,7 @@ activity-compose = "1.9.0"
 voyager = "1.1.0-alpha04"
 google-services = "4.4.1"
 firebase-bom = "33.0.0"
+jna = "5.14.0"
 
 [libraries]
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
@@ -113,6 +114,7 @@ breez-sdk-kmp = { module = "technology.breez:breez-sdk-kmp", version.ref = "bree
 breez-sdk-android = { module = "com.github.breez:breez-sdk", version.ref = "breez" } # Used for FDroid
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" }
 firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx" }
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
 sqldelight-native-driver = { module = "app.cash.sqldelight:native-driver", version.ref = "sqldelight" }
 sqldelight-sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-coroutines-extensions = { module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight" }

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -16,6 +16,7 @@
          <trust group="^org[.]jetbrains($|([.].*))" regex="true" reason="Trust all Jetbrains artifacts"/>
          <trust group="^org[.]junit($|([.].*))" regex="true" reason="Trust all JUnit artifacts"/>
          <trust group="^org[.]codehaus($|([.].*))" name="groovy" regex="true" reason="Trust all Groovy artifacts"/>
+         <trust group="^net[.]java($|([.].*))" name="jna" regex="true" reason="Trust all Java artifacts"/>
       </trusted-artifacts>
    </configuration>
    <components>

diff --git a/green/build.gradle.kts b/green/build.gradle.kts
@@ -41,8 +41,8 @@ android {
     defaultConfig {
         minSdk = libs.versions.androidMinSdk.get().toInt()
         targetSdk = libs.versions.androidTargetSdk.get().toInt()
-        versionCode = 428
-        versionName = "4.0.28"
+        versionCode = 429
+        versionName = "4.0.29"
 
         setProperty("archivesBaseName", "BlockstreamGreen-v$versionName")
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

diff --git a/prepare_fdroid.sh b/prepare_fdroid.sh
@@ -1,13 +1,6 @@
 #!/bin/bash
 
-set -e
-if [ -z "$ANDROID_NDK" ]; then
-    export ANDROID_NDK=$(dirname `which ndk-build 2>/dev/null`)
-fi
-
-echo ${ANDROID_NDK:?}
-exec gdk/prepare_gdk_clang.sh $1
-
 echo "Changing Breez SDK dependency from KMP to Android"
 sed -i -e 's/api(libs.breez.sdk.kmp)/\/\/ api(libs.breez.sdk.kmp)/g' common/build.gradle.kts
-sed -i -e 's/\/\/ api(libs.breez.sdk.android)/api(libs.breez.sdk.android)/g' common/build.gradle.kts
+sed -i -e 's/\/\/ api(libs.breez.sdk.android/api(libs.breez.sdk.android/g' common/build.gradle.kts
+sed -i -e 's/\/\/ implementation("${libs.jna/implementation("${libs.jna/g' common/build.gradle.kts