@samitouri / QOSAMI-cakewallet-1 / commits / c4926ae63

V4.6.6 fixes (#970)

* Fix popping wrong context in exchange page * Pass exception handler to wallets code * Fix mobile UI with iPad view * Set iPhone deployment target to 11 [skip ci] * Update Macos deployment target [skip ci]

Omar Hatem committed Jun 16, 2023 at 04:14 UTC c4926ae63ac4d28179b96965835585210b2bab05
11 files changed +71 -56
cw_bitcoin/lib/electrum_wallet.dart
+12 -4
@@ -1,7 +1,6 @@
1 import 'dart:async';
2 import 'dart:convert';
3 import 'dart:math';
4 -import 'dart:typed_data';
4 import 'package:cw_core/unspent_coins_info.dart';
5 import 'package:hive/hive.dart';
6 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
@@ -14,7 +13,6 @@ import 'package:cw_core/pathForWallet.dart';
13 import 'package:cw_bitcoin/address_to_output_script.dart';
14 import 'package:cw_bitcoin/bitcoin_address_record.dart';
15 import 'package:cw_bitcoin/electrum_balance.dart';
17 -import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
16 import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
17 import 'package:cw_bitcoin/electrum_transaction_history.dart';
18 import 'package:cw_bitcoin/bitcoin_transaction_no_inputs_exception.dart';
@@ -120,6 +118,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
118 Map<String, BehaviorSubject<Object>?> _scripthashesUpdateSubject;
119 bool _isTransactionUpdating;
120
121 + void Function(FlutterErrorDetails)? _onError;
122 +
123 Future<void> init() async {
124 await walletAddresses.init();
125 await transactionHistory.init();
@@ -322,7 +322,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
322 } else {
323 feeAmount = feeRate(transactionCredentials.priority!) * estimatedSize;
324 }
325 -
325 +
326 final changeValue = totalInputAmount - amount - feeAmount;
327
328 if (changeValue > minAmount) {
@@ -641,8 +641,13 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
641 await updateUnspent();
642 await updateBalance();
643 await updateTransactions();
644 - } catch (e) {
644 + } catch (e, s) {
645 print(e.toString());
646 + _onError?.call(FlutterErrorDetails(
647 + exception: e,
648 + stack: s,
649 + library: this.runtimeType.toString(),
650 + ));
651 }
652 });
653 });
@@ -708,4 +713,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
713
714 return addresses[random.nextInt(addresses.length)].address;
715 }
716 +
717 + @override
718 + void setExceptionHandler(void Function(FlutterErrorDetails) onError) => _onError = onError;
719 }
cw_core/lib/wallet_base.dart
+2
@@ -73,4 +73,6 @@ abstract class WalletBase<
73 Future<void> changePassword(String password);
74
75 Future<void>? updateBalance();
76 +
77 + void setExceptionHandler(void Function(FlutterErrorDetails) onError) => null;
78 }
ios/Podfile
+1
@@ -44,6 +44,7 @@ post_install do |installer|
44 flutter_additional_ios_build_settings(target)
45
46 target.build_configurations.each do |config|
47 + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
48 config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
49 '$(inherited)',
50
ios/Podfile.lock
+9 -9
@@ -7,7 +7,7 @@ PODS:
7 - connectivity_plus (0.0.1):
8 - Flutter
9 - ReachabilitySwift
10 - - CryptoSwift (1.6.0)
10 + - CryptoSwift (1.7.1)
11 - cw_haven (0.0.1):
12 - cw_haven/Boost (= 0.0.1)
13 - cw_haven/Haven (= 0.0.1)
@@ -131,15 +131,15 @@ PODS:
131 - platform_device_id (0.0.1):
132 - Flutter
133 - ReachabilitySwift (5.0.0)
134 - - SDWebImage (5.15.5):
135 - - SDWebImage/Core (= 5.15.5)
136 - - SDWebImage/Core (5.15.5)
134 + - SDWebImage (5.16.0):
135 + - SDWebImage/Core (= 5.16.0)
136 + - SDWebImage/Core (5.16.0)
137 - share_plus (0.0.1):
138 - Flutter
139 - shared_preferences_foundation (0.0.1):
140 - Flutter
141 - FlutterMacOS
142 - - SwiftProtobuf (1.21.0)
142 + - SwiftProtobuf (1.22.0)
143 - SwiftyGif (5.4.4)
144 - uni_links (0.0.1):
145 - Flutter
@@ -250,7 +250,7 @@ SPEC CHECKSUMS:
250 barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
251 BigInt: f668a80089607f521586bbe29513d708491ef2f7
252 connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
253 - CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6
253 + CryptoSwift: d3d18dc357932f7e6d580689e065cf1f176007c1
254 cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
255 cw_monero: 4cf3b96f2da8e95e2ef7d6703dd4d2c509127b7d
256 cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
@@ -274,16 +274,16 @@ SPEC CHECKSUMS:
274 permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4
275 platform_device_id: 81b3e2993881f87d0c82ef151dc274df4869aef5
276 ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
277 - SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
277 + SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
278 share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
279 shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
280 - SwiftProtobuf: afced68785854575756db965e9da52bbf3dc45e7
280 + SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989
281 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
282 uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
283 UnstoppableDomainsResolution: c3c67f4d0a5e2437cb00d4bd50c2e00d6e743841
284 url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
285 wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
286
287 -PODFILE CHECKSUM: ae71bdf0eb731a1ffc399c122f6aa4dea0cb5f6f
287 +PODFILE CHECKSUM: 09df1114e7c360f55770d35a79356bf5446e0100
288
289 COCOAPODS: 1.11.3
ios/Runner.xcodeproj/project.pbxproj
+27 -27
@@ -10,8 +10,8 @@
10 0C44A71A2518EF8000B570ED /* decrypt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44A7192518EF8000B570ED /* decrypt.swift */; };
11 0C9D68C9264854B60011B691 /* secRandom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C9D68C8264854B60011B691 /* secRandom.swift */; };
12 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
13 - 20ED0868E1BD7E12278C0CB3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */; };
13 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
14 + 4DFD1BB54A3A50573E19A583 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C663361C56EBB242598F609 /* Pods_Runner.framework */; };
15 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
16 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
17 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -23,13 +23,13 @@
23 0C44A7192518EF8000B570ED /* decrypt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = decrypt.swift; sourceTree = "<group>"; };
24 0C9986A3251A932F00D566FD /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
25 0C9D68C8264854B60011B691 /* secRandom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = secRandom.swift; sourceTree = "<group>"; };
26 + 11F9FC13F9EE2A705B213FA9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
27 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
28 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
28 - 20F67A1B2C2FCB2A3BB048C1 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
29 + 1F083F2041D1F553F2AF8B62 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
30 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
30 - 501EA9286675DC8636978EA4 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
31 + 3C663361C56EBB242598F609 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
32 5AFFEBFC279AD49C00F906A4 /* wakeLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = wakeLock.swift; sourceTree = "<group>"; };
32 - 61CAA8652B54F23356F7592A /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
33 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
34 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
35 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -40,7 +40,7 @@
40 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
41 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
42 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
43 - B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43 + AD0937B0140D5A4C24E73BEA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
44 /* End PBXFileReference section */
45
46 /* Begin PBXFrameworksBuildPhase section */
@@ -48,7 +48,7 @@
48 isa = PBXFrameworksBuildPhase;
49 buildActionMask = 2147483647;
50 files = (
51 - 20ED0868E1BD7E12278C0CB3 /* Pods_Runner.framework in Frameworks */,
51 + 4DFD1BB54A3A50573E19A583 /* Pods_Runner.framework in Frameworks */,
52 );
53 runOnlyForDeploymentPostprocessing = 0;
54 };
@@ -59,7 +59,7 @@
59 isa = PBXGroup;
60 children = (
61 0C9986A3251A932F00D566FD /* CryptoSwift.framework */,
62 - B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */,
62 + 3C663361C56EBB242598F609 /* Pods_Runner.framework */,
63 );
64 name = Frameworks;
65 sourceTree = "<group>";
@@ -77,9 +77,9 @@
77 84389F1A05D5860790D82820 /* Pods */ = {
78 isa = PBXGroup;
79 children = (
80 - 20F67A1B2C2FCB2A3BB048C1 /* Pods-Runner.debug.xcconfig */,
81 - 501EA9286675DC8636978EA4 /* Pods-Runner.release.xcconfig */,
82 - 61CAA8652B54F23356F7592A /* Pods-Runner.profile.xcconfig */,
80 + 11F9FC13F9EE2A705B213FA9 /* Pods-Runner.debug.xcconfig */,
81 + 1F083F2041D1F553F2AF8B62 /* Pods-Runner.release.xcconfig */,
82 + AD0937B0140D5A4C24E73BEA /* Pods-Runner.profile.xcconfig */,
83 );
84 path = Pods;
85 sourceTree = "<group>";
@@ -138,13 +138,13 @@
138 isa = PBXNativeTarget;
139 buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
140 buildPhases = (
141 - 0843B0813AFBAF53935AD24E /* [CP] Check Pods Manifest.lock */,
141 + B91154210ADCED81FBF06A85 /* [CP] Check Pods Manifest.lock */,
142 9740EEB61CF901F6004384FC /* Run Script */,
143 97C146EA1CF9000F007C117D /* Sources */,
144 97C146EB1CF9000F007C117D /* Frameworks */,
145 97C146EC1CF9000F007C117D /* Resources */,
146 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
147 - DD8DB3179CA4E511F9954A6F /* [CP] Embed Pods Frameworks */,
147 + 32D0076A9969C0C38D68AF62 /* [CP] Embed Pods Frameworks */,
148 );
149 buildRules = (
150 );
@@ -203,26 +203,21 @@
203 /* End PBXResourcesBuildPhase section */
204
205 /* Begin PBXShellScriptBuildPhase section */
206 - 0843B0813AFBAF53935AD24E /* [CP] Check Pods Manifest.lock */ = {
206 + 32D0076A9969C0C38D68AF62 /* [CP] Embed Pods Frameworks */ = {
207 isa = PBXShellScriptBuildPhase;
208 buildActionMask = 2147483647;
209 files = (
210 );
211 inputFileListPaths = (
212 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
213 );
213 - inputPaths = (
214 - "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
215 - "${PODS_ROOT}/Manifest.lock",
216 - );
217 - name = "[CP] Check Pods Manifest.lock";
214 + name = "[CP] Embed Pods Frameworks";
215 outputFileListPaths = (
219 - );
220 - outputPaths = (
221 - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
216 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
217 );
218 runOnlyForDeploymentPostprocessing = 0;
219 shellPath = /bin/sh;
225 - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
220 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
221 showEnvVarsInLog = 0;
222 };
223 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
@@ -255,21 +250,26 @@
250 shellPath = /bin/sh;
251 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
252 };
258 - DD8DB3179CA4E511F9954A6F /* [CP] Embed Pods Frameworks */ = {
253 + B91154210ADCED81FBF06A85 /* [CP] Check Pods Manifest.lock */ = {
254 isa = PBXShellScriptBuildPhase;
255 buildActionMask = 2147483647;
256 files = (
257 );
258 inputFileListPaths = (
264 - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
259 );
266 - name = "[CP] Embed Pods Frameworks";
260 + inputPaths = (
261 + "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
262 + "${PODS_ROOT}/Manifest.lock",
263 + );
264 + name = "[CP] Check Pods Manifest.lock";
265 outputFileListPaths = (
268 - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
266 + );
267 + outputPaths = (
268 + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
269 );
270 runOnlyForDeploymentPostprocessing = 0;
271 shellPath = /bin/sh;
272 - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
272 + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
273 showEnvVarsInLog = 0;
274 };
275 /* End PBXShellScriptBuildPhase section */
lib/src/screens/exchange/exchange_page.dart
+2 -2
@@ -599,8 +599,8 @@ class ExchangePage extends BasePage {
599 alertContent: S.of(context).low_fee_alert,
600 leftButtonText: S.of(context).ignor,
601 rightButtonText: S.of(context).use_suggested,
602 - actionLeftButton: () => Navigator.of(context).pop(false),
603 - actionRightButton: () => Navigator.of(context).pop(true));
602 + actionLeftButton: () => Navigator.of(dialogContext).pop(false),
603 + actionRightButton: () => Navigator.of(dialogContext).pop(true));
604 }) ?? false;
605 if (confirmed) {
606 exchangeViewModel.setDefaultTransactionPriority();
lib/store/app_store.dart
+2
@@ -1,3 +1,4 @@
1 +import 'package:cake_wallet/utils/exception_handler.dart';
2 import 'package:cw_core/transaction_info.dart';
3 import 'package:mobx/mobx.dart';
4 import 'package:cw_core/balance.dart';
@@ -38,5 +39,6 @@ abstract class AppStoreBase with Store {
39 wallet) {
40 this.wallet?.close();
41 this.wallet = wallet;
42 + this.wallet!.setExceptionHandler(ExceptionHandler.onError);
43 }
44 }
lib/utils/responsive_layout_util.dart
+2 -2
@@ -12,10 +12,10 @@ class ResponsiveLayoutUtil {
12 static final instance = ResponsiveLayoutUtil._();
13
14 bool get isMobile =>
15 - WidgetsBinding.instance.platformDispatcher.views.first.physicalSize.width < _kMobileThreshold;
15 + MediaQueryData.fromWindow(WidgetsBinding.instance.window).size.width < _kMobileThreshold;
16
17 bool get isIpad {
18 - final width = WidgetsBinding.instance.platformDispatcher.views.first.physicalSize.width;
18 + final width = MediaQueryData.fromWindow(WidgetsBinding.instance.window).size.width;
19 return width >= _kMobileThreshold && !(width > _kIpadMaxWidth);
20 }
21
macos/Podfile
+4
@@ -36,5 +36,9 @@ end
36 post_install do |installer|
37 installer.pods_project.targets.each do |target|
38 flutter_additional_macos_build_settings(target)
39 +
40 + target.build_configurations.each do |config|
41 + config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '12.0'
42 + end
43 end
44 end
macos/Podfile.lock
+10 -10
@@ -1,7 +1,7 @@
1 PODS:
2 - - connectivity_macos (0.0.1):
2 + - connectivity_plus_macos (0.0.1):
3 - FlutterMacOS
4 - - Reachability
4 + - ReachabilitySwift
5 - cw_monero (0.0.1):
6 - cw_monero/Boost (= 0.0.1)
7 - cw_monero/Monero (= 0.0.1)
@@ -37,7 +37,7 @@ PODS:
37 - FlutterMacOS
38 - platform_device_id_macos (0.0.1):
39 - FlutterMacOS
40 - - Reachability (3.2)
40 + - ReachabilitySwift (5.0.0)
41 - share_plus_macos (0.0.1):
42 - FlutterMacOS
43 - shared_preferences_foundation (0.0.1):
@@ -49,7 +49,7 @@ PODS:
49 - FlutterMacOS
50
51 DEPENDENCIES:
52 - - connectivity_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos`)
52 + - connectivity_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus_macos/macos`)
53 - cw_monero (from `Flutter/ephemeral/.symlinks/plugins/cw_monero/macos`)
54 - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
55 - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`)
@@ -67,11 +67,11 @@ DEPENDENCIES:
67
68 SPEC REPOS:
69 trunk:
70 - - Reachability
70 + - ReachabilitySwift
71
72 EXTERNAL SOURCES:
73 - connectivity_macos:
74 - :path: Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos
73 + connectivity_plus_macos:
74 + :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus_macos/macos
75 cw_monero:
76 :path: Flutter/ephemeral/.symlinks/plugins/cw_monero/macos
77 device_info_plus:
@@ -102,7 +102,7 @@ EXTERNAL SOURCES:
102 :path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos
103
104 SPEC CHECKSUMS:
105 - connectivity_macos: 5dae6ee11d320fac7c05f0d08bd08fc32b5514d9
105 + connectivity_plus_macos: f6e86fd000e971d361e54b5afcadc8c8fa773308
106 cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4
107 device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
108 devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
@@ -113,12 +113,12 @@ SPEC CHECKSUMS:
113 path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
114 platform_device_id: 3e414428f45df149bbbfb623e2c0ca27c545b763
115 platform_device_id_macos: f763bb55f088be804d61b96eb4710b8ab6598e94
116 - Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
116 + ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
117 share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4
118 shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
119 url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451
120 wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
121
122 -PODFILE CHECKSUM: 505596d150d38022472859d890f709281982e016
122 +PODFILE CHECKSUM: 5107934592df7813b33d744aebc8ddc6b5a5445f
123
124 COCOAPODS: 1.11.3
macos/Runner.xcodeproj/project.pbxproj
-2
@@ -75,7 +75,6 @@
75 9646C67C7114830A5ACFF5DF /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
76 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
77 9F565D5729954F53009A75FB /* secRandom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = secRandom.swift; path = CakeWallet/secRandom.swift; sourceTree = "<group>"; };
78 - 9F565D5829954F53009A75FB /* decrypt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = decrypt.swift; path = CakeWallet/decrypt.swift; sourceTree = "<group>"; };
78 B38D1DBC56DBD386923BC063 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
79 /* End PBXFileReference section */
80
@@ -105,7 +104,6 @@
104 33CC10E42044A3C60003C045 = {
105 isa = PBXGroup;
106 children = (
108 - 9F565D5829954F53009A75FB /* decrypt.swift */,
107 9F565D5729954F53009A75FB /* secRandom.swift */,
108 33FAB671232836740065AC1E /* Runner */,
109 33CEB47122A05771004F2AC0 /* Flutter */,