Skip to content

Commit 573a345

Browse files
Downgrade android release to Uniffi 0.25 (#786)
* fix: revert minSdkVersion across all uniffi packages This PR fixes a regression introduced in #766 due to a confusion between minSdkVersion requirement & minimum compileSdkVersion requirement. * Bump package requirements on flutter_breez_liquid README * Bump JNA used on bindings tests to 5.14.0 * Downgrade android release to Uniffi 0.25 --------- Co-authored-by: Ross Savage <[email protected]>
1 parent ddbed6b commit 573a345

File tree

12 files changed

+25
-31
lines changed

12 files changed

+25
-31
lines changed

.github/workflows/build-language-bindings.yml

+8-14
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ on:
6060
jobs:
6161
build-language-bindings:
6262
runs-on: ubuntu-latest
63-
if: ${{ inputs.kotlin || inputs.swift || inputs.python }}
63+
if: ${{ inputs.swift || inputs.python }}
6464
steps:
6565
- name: Checkout breez-sdk-liquid repo
6666
uses: actions/checkout@v4
@@ -82,19 +82,6 @@ jobs:
8282
- uses: Swatinem/rust-cache@v2
8383
with:
8484
workspaces: lib
85-
86-
- name: Build Kotlin binding
87-
if: ${{ inputs.kotlin }}
88-
working-directory: lib/bindings
89-
run: |
90-
cargo run --bin uniffi-bindgen generate src/breez_sdk_liquid.udl --language kotlin -o ffi/kotlin
91-
92-
- name: Archive Kotlin binding
93-
if: ${{ inputs.kotlin }}
94-
uses: actions/upload-artifact@v4
95-
with:
96-
name: bindings-kotlin
97-
path: lib/bindings/ffi/kotlin/breez_sdk_liquid/breez_sdk_liquid.kt
9885

9986
- name: Build Swift binding
10087
if: ${{ inputs.swift }}
@@ -154,6 +141,13 @@ jobs:
154141
working-directory: lib/bindings
155142
run: |
156143
cargo run --no-default-features --features=uniffi-25 --bin uniffi-bindgen generate src/breez_sdk_liquid.udl --language kotlin -o ffi/kotlin
144+
145+
- name: Archive Kotlin binding
146+
if: ${{ inputs.kotlin }}
147+
uses: actions/upload-artifact@v4
148+
with:
149+
name: bindings-kotlin
150+
path: lib/bindings/ffi/kotlin/breez_sdk_liquid/breez_sdk_liquid.kt
157151

158152
- name: Archive Kotlin multiplatform binding
159153
if: ${{ inputs.kotlin }}

.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ jobs:
217217

218218
- name: Run bindings tests
219219
run: |
220-
curl -o jna-5.12.1.jar https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
221-
export CLASSPATH=$(pwd)/jna-5.12.1.jar;
220+
curl -o jna-5.14.0.jar https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar
221+
export CLASSPATH=$(pwd)/jna-5.14.0.jar;
222222
cd lib/bindings
223223
cargo test
224224
@@ -335,7 +335,7 @@ jobs:
335335
- name: Build Android bindings
336336
working-directory: lib/bindings
337337
run: |
338-
cargo run --bin uniffi-bindgen generate src/breez_sdk_liquid.udl --no-format --language kotlin -o langs/android/lib/src/main/kotlin
338+
cargo run --no-default-features --features=uniffi-25 --bin uniffi-bindgen generate src/breez_sdk_liquid.udl --no-format --language kotlin -o langs/android/lib/src/main/kotlin
339339
340340
- name: Run Android build
341341
working-directory: lib/bindings/langs/android

.github/workflows/publish-all-platforms.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
swift-package-version: ${{ needs.pre-setup.outputs.swift-package-version || '0.0.2' }}
122122
publish: ${{ needs.pre-setup.outputs.publish }}
123123
use-dummy-binaries: ${{ needs.pre-setup.outputs.use-dummy-binaries }}
124-
uniffi-25: ${{ !!needs.pre-setup.outputs.csharp-package-version || !!needs.pre-setup.outputs.golang-package-version || !!needs.pre-setup.outputs.kotlin-multiplatform-package-version }}
124+
uniffi-25: ${{ !!needs.pre-setup.outputs.csharp-package-version || !!needs.pre-setup.outputs.golang-package-version || !!needs.pre-setup.outputs.kotlin-multiplatform-package-version || !!needs.pre-setup.outputs.maven-package-version }}
125125
steps:
126126
- run: echo "set setup output variables"
127127

.github/workflows/publish-android.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
- uses: actions/download-artifact@v4
4646
with:
47-
name: bindings-android-jniLibs
47+
name: bindings-android-jniLibs-uniffi-25
4848
path: lib/bindings/langs/android/lib/src/main/jniLibs
4949

5050
- uses: actions/download-artifact@v4

lib/bindings/langs/android/lib/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
compileSdk = 34
1515

1616
defaultConfig {
17-
minSdk = 33
17+
minSdk = 24
1818
consumerProguardFiles("consumer-rules.pro")
1919
}
2020

lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ android {
8383
compileSdk = 33
8484

8585
defaultConfig {
86-
minSdk = 21
86+
minSdk = 24
8787
consumerProguardFiles("consumer-rules.pro")
8888
}
8989

lib/bindings/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ x86_64-linux-android-uniffi-25: $(SOURCES) ndk-home
5858
cargo ndk -t x86_64-linux-android -o ffi/kotlin/jniLibs build --no-default-features --features=uniffi-25 --release
5959
cp -a $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(OS_NAME)-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so ffi/kotlin/jniLibs/x86_64/
6060

61-
bindings-android: android
61+
bindings-android: android-uniffi-25
6262
cp -r ffi/kotlin/jniLibs langs/android/lib/src/main
6363
cp -r ffi/kotlin/breez_sdk_liquid langs/android/lib/src/main/kotlin/
6464
cd langs/android && ./gradlew assemble

packages/flutter/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
## Requirements
2020

21-
- Flutter >=3.10.0
22-
- Dart >=3.4.0 <4.0.0
23-
- iOS >=12.0
24-
- MacOS >=10.11
25-
- Android `compileSDK` 31
21+
- Flutter >=3.27.0
22+
- Dart >=3.6.0 <4.0.0
23+
- iOS >=13.0
24+
- MacOS >=15.0
25+
- Android `compileSDK` 35
2626
- Java 1.8
2727
- Android Gradle Plugin >=7.1.2
2828
- Gradle wrapper >=7.4

packages/flutter/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
}
5252

5353
defaultConfig {
54-
minSdkVersion 33
54+
minSdkVersion 24
5555
}
5656
}
5757

packages/flutter/android/build.gradle.production

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
}
5252

5353
defaultConfig {
54-
minSdkVersion 33
54+
minSdkVersion 24
5555
}
5656
}
5757

packages/react-native/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
android {
2727
compileSdkVersion 34
2828
defaultConfig {
29-
minSdkVersion 33
29+
minSdkVersion 24
3030
targetSdkVersion 34
3131
versionCode 1
3232
versionName "1.0"

packages/react-native/example/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
buildscript {
44
ext {
55
buildToolsVersion = "33.0.0"
6-
minSdkVersion = 33
6+
minSdkVersion = 24
77
compileSdkVersion = 34
88
targetSdkVersion = 34
99
kotlin_version = "1.8.0"

0 commit comments

Comments
 (0)