Skip to content

Commit 71ed192

Browse files
takenagaintakenagain
authored
build(ios,macos): update pod file locks to match pubspec (#2594)
* build(ios,macos): update pod files to match latest dependency locks * build: apply flutterfire_cli configuration updates * fix(firebase): add missing placeholder windows configuration * ci(android): comment out google services to fix build without config * chore(deps): update SDK commit hash * ci(mobile): remove build command argument defaults to building web first before iOS, ensuring that the required assets are downloaded
1 parent f600dfc commit 71ed192

File tree

11 files changed

+114
-86
lines changed

11 files changed

+114
-86
lines changed

‎.github/actions/releases/setup-android/action.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ runs:
3232

3333
- name: Setup Android SDK
3434
uses: android-actions/setup-android@v3
35+
36+
# "Fixes firebase build error when no valid google-services.json is present"
37+
- name: Comment out Google Play Services import
38+
shell: bash
39+
run: |
40+
sed -i 's/id .com\.google\.gms\.google-services./\/\/ id .com\.google\.gms\.google-services./' android/app/build.gradle
41+
echo "Google Play Services import commented out"
3542
3643
- name: Setup Android keystore
3744
if: inputs.keystore-base64 != '' && 'KomodoPlatform/komodo-wallet' == github.repository

‎.github/workflows/mobile-builds.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ jobs:
6767
FEEDBACK_API_KEY: ${{ secrets.FEEDBACK_API_KEY }}
6868
FEEDBACK_PRODUCTION_URL: ${{ secrets.FEEDBACK_PRODUCTION_URL }}
6969
FEEDBACK_TEST_URL: ${{ secrets.FEEDBACK_TEST_URL }}
70-
BUILD_COMMAND: ${{ matrix.build_command }}
7170

7271
- name: Build for ${{ matrix.platform }}
7372
env:

‎android/app/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
plugins {
22
id "com.android.application"
3+
// START: FlutterFire Configuration
4+
id 'com.google.gms.google-services'
5+
// END: FlutterFire Configuration
36
id "kotlin-android"
47
id "dev.flutter.flutter-gradle-plugin"
58
}

‎android/settings.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ pluginManagement {
1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2121
// Gradle plugin version https://developer.android.com/build/releases/gradle-plugin
22-
id "com.android.application" version "8.8.0" apply false
22+
id "com.android.application" version "8.8.0" apply false
23+
// START: FlutterFire Configuration
24+
id "com.google.gms.google-services" version "4.3.15" apply false
25+
// END: FlutterFire Configuration
2326
// Kotlin release with JVM 21 support: https://kotlinlang.org/docs/releases.html#release-details
2427
id "org.jetbrains.kotlin.android" version "2.1.10" apply false
2528
}

‎ios/Podfile.lock‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -33,46 +33,46 @@ PODS:
3333
- file_picker (0.0.1):
3434
- DKImagePickerController/PhotoGallery
3535
- Flutter
36-
- Firebase/Analytics (11.8.0):
36+
- Firebase/Analytics (11.10.0):
3737
- Firebase/Core
38-
- Firebase/Core (11.8.0):
38+
- Firebase/Core (11.10.0):
3939
- Firebase/CoreOnly
40-
- FirebaseAnalytics (~> 11.8.0)
41-
- Firebase/CoreOnly (11.8.0):
42-
- FirebaseCore (~> 11.8.0)
43-
- firebase_analytics (11.4.4):
44-
- Firebase/Analytics (= 11.8.0)
40+
- FirebaseAnalytics (~> 11.10.0)
41+
- Firebase/CoreOnly (11.10.0):
42+
- FirebaseCore (~> 11.10.0)
43+
- firebase_analytics (11.4.5):
44+
- Firebase/Analytics (= 11.10.0)
4545
- firebase_core
4646
- Flutter
47-
- firebase_core (3.12.1):
48-
- Firebase/CoreOnly (= 11.8.0)
47+
- firebase_core (3.13.0):
48+
- Firebase/CoreOnly (= 11.10.0)
4949
- Flutter
50-
- FirebaseAnalytics (11.8.0):
51-
- FirebaseAnalytics/AdIdSupport (= 11.8.0)
52-
- FirebaseCore (~> 11.8.0)
50+
- FirebaseAnalytics (11.10.0):
51+
- FirebaseAnalytics/AdIdSupport (= 11.10.0)
52+
- FirebaseCore (~> 11.10.0)
5353
- FirebaseInstallations (~> 11.0)
5454
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
5555
- GoogleUtilities/MethodSwizzler (~> 8.0)
5656
- GoogleUtilities/Network (~> 8.0)
5757
- "GoogleUtilities/NSData+zlib (~> 8.0)"
5858
- nanopb (~> 3.30910.0)
59-
- FirebaseAnalytics/AdIdSupport (11.8.0):
60-
- FirebaseCore (~> 11.8.0)
59+
- FirebaseAnalytics/AdIdSupport (11.10.0):
60+
- FirebaseCore (~> 11.10.0)
6161
- FirebaseInstallations (~> 11.0)
62-
- GoogleAppMeasurement (= 11.8.0)
62+
- GoogleAppMeasurement (= 11.10.0)
6363
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
6464
- GoogleUtilities/MethodSwizzler (~> 8.0)
6565
- GoogleUtilities/Network (~> 8.0)
6666
- "GoogleUtilities/NSData+zlib (~> 8.0)"
6767
- nanopb (~> 3.30910.0)
68-
- FirebaseCore (11.8.1):
69-
- FirebaseCoreInternal (~> 11.8.0)
68+
- FirebaseCore (11.10.0):
69+
- FirebaseCoreInternal (~> 11.10.0)
7070
- GoogleUtilities/Environment (~> 8.0)
7171
- GoogleUtilities/Logger (~> 8.0)
72-
- FirebaseCoreInternal (11.8.0):
72+
- FirebaseCoreInternal (11.10.0):
7373
- "GoogleUtilities/NSData+zlib (~> 8.0)"
74-
- FirebaseInstallations (11.8.0):
75-
- FirebaseCore (~> 11.8.0)
74+
- FirebaseInstallations (11.10.0):
75+
- FirebaseCore (~> 11.10.0)
7676
- GoogleUtilities/Environment (~> 8.0)
7777
- GoogleUtilities/UserDefaults (~> 8.0)
7878
- PromisesObjC (~> 2.4)
@@ -87,21 +87,21 @@ PODS:
8787
- flutter_secure_storage_darwin (10.0.0):
8888
- Flutter
8989
- FlutterMacOS
90-
- GoogleAppMeasurement (11.8.0):
91-
- GoogleAppMeasurement/AdIdSupport (= 11.8.0)
90+
- GoogleAppMeasurement (11.10.0):
91+
- GoogleAppMeasurement/AdIdSupport (= 11.10.0)
9292
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
9393
- GoogleUtilities/MethodSwizzler (~> 8.0)
9494
- GoogleUtilities/Network (~> 8.0)
9595
- "GoogleUtilities/NSData+zlib (~> 8.0)"
9696
- nanopb (~> 3.30910.0)
97-
- GoogleAppMeasurement/AdIdSupport (11.8.0):
98-
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0)
97+
- GoogleAppMeasurement/AdIdSupport (11.10.0):
98+
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0)
9999
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
100100
- GoogleUtilities/MethodSwizzler (~> 8.0)
101101
- GoogleUtilities/Network (~> 8.0)
102102
- "GoogleUtilities/NSData+zlib (~> 8.0)"
103103
- nanopb (~> 3.30910.0)
104-
- GoogleAppMeasurement/WithoutAdIdSupport (11.8.0):
104+
- GoogleAppMeasurement/WithoutAdIdSupport (11.10.0):
105105
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
106106
- GoogleUtilities/MethodSwizzler (~> 8.0)
107107
- GoogleUtilities/Network (~> 8.0)
@@ -283,17 +283,17 @@ SPEC CHECKSUMS:
283283
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
284284
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
285285
file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
286-
Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
287-
firebase_analytics: e3b6782e70e32b7fa18f7cd233e3201975dd86aa
288-
firebase_core: ac395f994af4e28f6a38b59e05a88ca57abeb874
289-
FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b
290-
FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
291-
FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
292-
FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
286+
Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
287+
firebase_analytics: 4b8609ce8d2e0c8928472bec8d9753a8f1835eb6
288+
firebase_core: 432718558359a8c08762151b5f49bb0f093eb6e0
289+
FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef
290+
FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
291+
FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
292+
FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
293293
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
294294
flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
295295
flutter_secure_storage_darwin: 12d2375c690785d97a4e586f15f11be5ae35d5b0
296-
GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
296+
GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
297297
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
298298
GoogleMLKit: eff9e23ec1d90ea4157a1ee2e32a4f610c5b3318
299299
GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,14 @@
272272
inputFileListPaths = (
273273
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
274274
);
275+
inputPaths = (
276+
);
275277
name = "[CP] Copy Pods Resources";
276278
outputFileListPaths = (
277279
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
278280
);
281+
outputPaths = (
282+
);
279283
runOnlyForDeploymentPostprocessing = 0;
280284
shellPath = /bin/sh;
281285
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -304,10 +308,14 @@
304308
inputFileListPaths = (
305309
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
306310
);
311+
inputPaths = (
312+
);
307313
name = "[CP] Embed Pods Frameworks";
308314
outputFileListPaths = (
309315
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
310316
);
317+
outputPaths = (
318+
);
311319
runOnlyForDeploymentPostprocessing = 0;
312320
shellPath = /bin/sh;
313321
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";

‎lib/firebase_options.dart‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ class DefaultFirebaseOptions {
2727
case TargetPlatform.macOS:
2828
return macos;
2929
case TargetPlatform.windows:
30-
throw UnsupportedError(
31-
'DefaultFirebaseOptions have not been configured for windows - '
32-
'you can reconfigure this by running the FlutterFire CLI again.',
33-
);
30+
return windows;
3431
case TargetPlatform.linux:
3532
throw UnsupportedError(
3633
'DefaultFirebaseOptions have not been configured for linux - '
@@ -78,4 +75,14 @@ class DefaultFirebaseOptions {
7875
storageBucket: '<THIS_IS_AUTOGENERATED>',
7976
iosBundleId: '<THIS_IS_AUTOGENERATED>',
8077
);
78+
79+
static const FirebaseOptions windows = FirebaseOptions(
80+
apiKey: '<THIS_IS_AUTOGENERATED>',
81+
appId: '<THIS_IS_AUTOGENERATED>',
82+
messagingSenderId: '<THIS_IS_AUTOGENERATED>',
83+
projectId: '<THIS_IS_AUTOGENERATED>',
84+
authDomain: '<THIS_IS_AUTOGENERATED>',
85+
storageBucket: '<THIS_IS_AUTOGENERATED>',
86+
measurementId: '<THIS_IS_AUTOGENERATED>',
87+
);
8188
}

‎macos/Podfile.lock‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
PODS:
22
- file_picker (0.0.1):
33
- FlutterMacOS
4-
- Firebase/Analytics (11.8.0):
4+
- Firebase/Analytics (11.10.0):
55
- Firebase/Core
6-
- Firebase/Core (11.8.0):
6+
- Firebase/Core (11.10.0):
77
- Firebase/CoreOnly
8-
- FirebaseAnalytics (~> 11.8.0)
9-
- Firebase/CoreOnly (11.8.0):
10-
- FirebaseCore (~> 11.8.0)
11-
- firebase_analytics (11.4.4):
12-
- Firebase/Analytics (= 11.8.0)
8+
- FirebaseAnalytics (~> 11.10.0)
9+
- Firebase/CoreOnly (11.10.0):
10+
- FirebaseCore (~> 11.10.0)
11+
- firebase_analytics (11.4.5):
12+
- Firebase/Analytics (= 11.10.0)
1313
- firebase_core
1414
- FlutterMacOS
15-
- firebase_core (3.12.1):
16-
- Firebase/CoreOnly (~> 11.8.0)
15+
- firebase_core (3.13.0):
16+
- Firebase/CoreOnly (~> 11.10.0)
1717
- FlutterMacOS
18-
- FirebaseAnalytics (11.8.0):
19-
- FirebaseAnalytics/AdIdSupport (= 11.8.0)
20-
- FirebaseCore (~> 11.8.0)
18+
- FirebaseAnalytics (11.10.0):
19+
- FirebaseAnalytics/AdIdSupport (= 11.10.0)
20+
- FirebaseCore (~> 11.10.0)
2121
- FirebaseInstallations (~> 11.0)
2222
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
2323
- GoogleUtilities/MethodSwizzler (~> 8.0)
2424
- GoogleUtilities/Network (~> 8.0)
2525
- "GoogleUtilities/NSData+zlib (~> 8.0)"
2626
- nanopb (~> 3.30910.0)
27-
- FirebaseAnalytics/AdIdSupport (11.8.0):
28-
- FirebaseCore (~> 11.8.0)
27+
- FirebaseAnalytics/AdIdSupport (11.10.0):
28+
- FirebaseCore (~> 11.10.0)
2929
- FirebaseInstallations (~> 11.0)
30-
- GoogleAppMeasurement (= 11.8.0)
30+
- GoogleAppMeasurement (= 11.10.0)
3131
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
3232
- GoogleUtilities/MethodSwizzler (~> 8.0)
3333
- GoogleUtilities/Network (~> 8.0)
3434
- "GoogleUtilities/NSData+zlib (~> 8.0)"
3535
- nanopb (~> 3.30910.0)
36-
- FirebaseCore (11.8.1):
37-
- FirebaseCoreInternal (~> 11.8.0)
36+
- FirebaseCore (11.10.0):
37+
- FirebaseCoreInternal (~> 11.10.0)
3838
- GoogleUtilities/Environment (~> 8.0)
3939
- GoogleUtilities/Logger (~> 8.0)
40-
- FirebaseCoreInternal (11.8.0):
40+
- FirebaseCoreInternal (11.10.0):
4141
- "GoogleUtilities/NSData+zlib (~> 8.0)"
42-
- FirebaseInstallations (11.8.0):
43-
- FirebaseCore (~> 11.8.0)
42+
- FirebaseInstallations (11.10.0):
43+
- FirebaseCore (~> 11.10.0)
4444
- GoogleUtilities/Environment (~> 8.0)
4545
- GoogleUtilities/UserDefaults (~> 8.0)
4646
- PromisesObjC (~> 2.4)
@@ -51,21 +51,21 @@ PODS:
5151
- Flutter
5252
- FlutterMacOS
5353
- FlutterMacOS (1.0.0)
54-
- GoogleAppMeasurement (11.8.0):
55-
- GoogleAppMeasurement/AdIdSupport (= 11.8.0)
54+
- GoogleAppMeasurement (11.10.0):
55+
- GoogleAppMeasurement/AdIdSupport (= 11.10.0)
5656
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
5757
- GoogleUtilities/MethodSwizzler (~> 8.0)
5858
- GoogleUtilities/Network (~> 8.0)
5959
- "GoogleUtilities/NSData+zlib (~> 8.0)"
6060
- nanopb (~> 3.30910.0)
61-
- GoogleAppMeasurement/AdIdSupport (11.8.0):
62-
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0)
61+
- GoogleAppMeasurement/AdIdSupport (11.10.0):
62+
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0)
6363
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
6464
- GoogleUtilities/MethodSwizzler (~> 8.0)
6565
- GoogleUtilities/Network (~> 8.0)
6666
- "GoogleUtilities/NSData+zlib (~> 8.0)"
6767
- nanopb (~> 3.30910.0)
68-
- GoogleAppMeasurement/WithoutAdIdSupport (11.8.0):
68+
- GoogleAppMeasurement/WithoutAdIdSupport (11.10.0):
6969
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
7070
- GoogleUtilities/MethodSwizzler (~> 8.0)
7171
- GoogleUtilities/Network (~> 8.0)
@@ -197,19 +197,19 @@ EXTERNAL SOURCES:
197197

198198
SPEC CHECKSUMS:
199199
file_picker: e716a70a9fe5fd9e09ebc922d7541464289443af
200-
Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
201-
firebase_analytics: 75b9d9ea8b21ce77898a3a46910e2051e93db8e1
202-
firebase_core: 1b573eac37729348cdc472516991dd7e269ae37e
203-
FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b
204-
FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
205-
FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
206-
FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
200+
Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
201+
firebase_analytics: 934289da4d473663d5866f1563f0cae2a38ebd82
202+
firebase_core: bb06473757206589a00a36920cbf0f33646e19cc
203+
FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef
204+
FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
205+
FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
206+
FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
207207
flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b
208208
flutter_secure_storage_darwin: 12d2375c690785d97a4e586f15f11be5ae35d5b0
209209
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
210-
GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
210+
GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
211211
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
212-
komodo_defi_framework: c01710e1bf0eaa1fad46b3e4ba596f24dba394fd
212+
komodo_defi_framework: 263b99ca54a5e732a6593938d0a88e31c30a7f81
213213
local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
214214
mobile_scanner: 07710d6b9b2c220ae899de2d7ecf5d77ffa56333
215215
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275

‎packages/komodo_ui_kit/pubspec.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ packages:
9595
description:
9696
path: "packages/komodo_defi_rpc_methods"
9797
ref: dev
98-
resolved-ref: "6fdcc0ea193e21fde40a3248853dc39e2e568de7"
98+
resolved-ref: "67e531eee96175beeddbfd12d661f353b9d66650"
9999
url: "https://github.com/KomodoPlatform/komodo-defi-sdk-flutter.git"
100100
source: git
101101
version: "0.2.0+0"
@@ -104,7 +104,7 @@ packages:
104104
description:
105105
path: "packages/komodo_defi_types"
106106
ref: dev
107-
resolved-ref: "6fdcc0ea193e21fde40a3248853dc39e2e568de7"
107+
resolved-ref: "67e531eee96175beeddbfd12d661f353b9d66650"
108108
url: "https://github.com/KomodoPlatform/komodo-defi-sdk-flutter.git"
109109
source: git
110110
version: "0.2.0+0"
@@ -113,7 +113,7 @@ packages:
113113
description:
114114
path: "packages/komodo_ui"
115115
ref: dev
116-
resolved-ref: "6fdcc0ea193e21fde40a3248853dc39e2e568de7"
116+
resolved-ref: "67e531eee96175beeddbfd12d661f353b9d66650"
117117
url: "https://github.com/KomodoPlatform/komodo-defi-sdk-flutter.git"
118118
source: git
119119
version: "0.2.0+0"

0 commit comments

Comments
 (0)