Skip to content

Commit a75fb38

Browse files
authored
Merge pull request SatoshiPortal#2256 from SatoshiPortal/develop
chore: AAB builds and iOS version
2 parents ce6c5ac + c692d06 commit a75fb38

2 files changed

Lines changed: 21 additions & 17 deletions

File tree

.github/workflows/build-android.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Android APK
1+
name: Build Android
22

33
on:
44
workflow_dispatch:
@@ -7,6 +7,10 @@ on:
77
type: choice
88
options: [release, debug, beta]
99
default: release
10+
format:
11+
type: choice
12+
options: [apk, aab]
13+
default: apk
1014

1115
jobs:
1216
build:
@@ -55,12 +59,12 @@ jobs:
5559
keyPassword=$BETA_KEY_PASSWORD
5660
EOF
5761
58-
- name: Build APK
62+
- name: Build
5963
# makefile uses `podman` directly; ubuntu-24.04 ships podman 4.9.3 preinstalled.
60-
run: make android ${{ inputs.mode }}
64+
run: make android ${{ inputs.mode }} FORMAT=${{ inputs.format }}
6165

6266
- uses: actions/upload-artifact@v7
6367
with:
64-
name: BULL-${{ inputs.mode }}
65-
path: BULL-${{ inputs.mode }}.apk
68+
name: BULL-${{ inputs.mode }}-${{ inputs.format }}
69+
path: BULL-${{ inputs.mode }}.${{ inputs.format }}
6670
retention-days: 30

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -488,11 +488,11 @@
488488
buildSettings = {
489489
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
490490
CLANG_ENABLE_MODULES = YES;
491-
CURRENT_PROJECT_VERSION = 184;
491+
CURRENT_PROJECT_VERSION = 185;
492492
DEVELOPMENT_TEAM = BX99T32YGS;
493493
ENABLE_BITCODE = NO;
494-
FLUTTER_BUILD_NAME = 6.10.6;
495-
FLUTTER_BUILD_NUMBER = 184;
494+
FLUTTER_BUILD_NAME = 6.11.0;
495+
FLUTTER_BUILD_NUMBER = 185;
496496
INFOPLIST_FILE = Runner/Info.plist;
497497
INFOPLIST_KEY_CFBundleDisplayName = BULL;
498498
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
@@ -501,7 +501,7 @@
501501
"$(inherited)",
502502
"@executable_path/Frameworks",
503503
);
504-
MARKETING_VERSION = 6.10.6;
504+
MARKETING_VERSION = 6.11.0;
505505
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
506506
PRODUCT_NAME = "$(TARGET_NAME)";
507507
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -679,11 +679,11 @@
679679
buildSettings = {
680680
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
681681
CLANG_ENABLE_MODULES = YES;
682-
CURRENT_PROJECT_VERSION = 184;
682+
CURRENT_PROJECT_VERSION = 185;
683683
DEVELOPMENT_TEAM = BX99T32YGS;
684684
ENABLE_BITCODE = NO;
685-
FLUTTER_BUILD_NAME = 6.10.6;
686-
FLUTTER_BUILD_NUMBER = 184;
685+
FLUTTER_BUILD_NAME = 6.11.0;
686+
FLUTTER_BUILD_NUMBER = 185;
687687
INFOPLIST_FILE = Runner/Info.plist;
688688
INFOPLIST_KEY_CFBundleDisplayName = BULL;
689689
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
@@ -692,7 +692,7 @@
692692
"$(inherited)",
693693
"@executable_path/Frameworks",
694694
);
695-
MARKETING_VERSION = 6.10.6;
695+
MARKETING_VERSION = 6.11.0;
696696
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
697697
PRODUCT_NAME = "$(TARGET_NAME)";
698698
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -708,11 +708,11 @@
708708
buildSettings = {
709709
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
710710
CLANG_ENABLE_MODULES = YES;
711-
CURRENT_PROJECT_VERSION = 184;
711+
CURRENT_PROJECT_VERSION = 185;
712712
DEVELOPMENT_TEAM = BX99T32YGS;
713713
ENABLE_BITCODE = NO;
714-
FLUTTER_BUILD_NAME = 6.10.6;
715-
FLUTTER_BUILD_NUMBER = 184;
714+
FLUTTER_BUILD_NAME = 6.11.0;
715+
FLUTTER_BUILD_NUMBER = 185;
716716
INFOPLIST_FILE = Runner/Info.plist;
717717
INFOPLIST_KEY_CFBundleDisplayName = BULL;
718718
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
@@ -721,7 +721,7 @@
721721
"$(inherited)",
722722
"@executable_path/Frameworks",
723723
);
724-
MARKETING_VERSION = 6.10.6;
724+
MARKETING_VERSION = 6.11.0;
725725
PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.app;
726726
PRODUCT_NAME = "$(TARGET_NAME)";
727727
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

0 commit comments

Comments
 (0)