Skip to content

Commit 574d0e8

Browse files
julian-CStackjulian-CStack
authored
Merge pull request #1100 from cypherstack/apple_updates
Apple updates
2 parents 7439dbf + 30dedee commit 574d0e8

File tree

9 files changed

+22
-41
lines changed

9 files changed

+22
-41
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ coverage
5959
scripts/**/build
6060
/lib/external_api_keys.dart
6161

62-
libcw_monero.dll
63-
libcw_wownero.dll
6462
libepic_cash_wallet.dll
6563
libmobileliblelantus.dll
6664
libtor_ffi.dll

‎crypto_plugins/flutter_liblelantus‎

‎crypto_plugins/frostdart‎

‎ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ SPEC CHECKSUMS:
215215
devicelocale: 35ba84dc7f45f527c3001535d8c8d104edd5d926
216216
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
217217
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
218-
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
218+
file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
219219
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
220220
flutter_libepiccash: 36241aa7d3126f6521529985ccb3dc5eaf7bb317
221221
flutter_libsparkmobile: 6373955cc3327a926d17059e7405dde2fb12f99f
@@ -245,4 +245,4 @@ SPEC CHECKSUMS:
245245

246246
PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb
247247

248-
COCOAPODS: 1.15.2
248+
COCOAPODS: 1.16.2

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
5050
debugServiceExtension = "internal"
51+
enableGPUValidationMode = "1"
5152
allowLocationSimulation = "YES">
5253
<BuildableProductRunnable
5354
runnableDebuggingMode = "0">

‎macos/Podfile.lock‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ PODS:
1515
- FlutterMacOS
1616
- devicelocale (0.0.1):
1717
- FlutterMacOS
18+
- file_picker (0.0.1):
19+
- FlutterMacOS
1820
- flutter_libepiccash (0.0.1):
1921
- FlutterMacOS
2022
- flutter_libsparkmobile (0.0.1):
@@ -74,6 +76,7 @@ DEPENDENCIES:
7476
- desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
7577
- device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
7678
- devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`)
79+
- file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
7780
- flutter_libepiccash (from `Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos`)
7881
- flutter_libsparkmobile (from `Flutter/ephemeral/.symlinks/plugins/flutter_libsparkmobile/macos`)
7982
- flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
@@ -113,6 +116,8 @@ EXTERNAL SOURCES:
113116
:path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
114117
devicelocale:
115118
:path: Flutter/ephemeral/.symlinks/plugins/devicelocale/macos
119+
file_picker:
120+
:path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
116121
flutter_libepiccash:
117122
:path: Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos
118123
flutter_libsparkmobile:
@@ -158,6 +163,7 @@ SPEC CHECKSUMS:
158163
desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
159164
device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
160165
devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
166+
file_picker: e716a70a9fe5fd9e09ebc922d7541464289443af
161167
flutter_libepiccash: be1560a04150c5cc85bcf08d236ec2b3d1f5d8da
162168
flutter_libsparkmobile: df2d36af1691379c81249e7be7b68be3c81d388b
163169
flutter_local_notifications: 4b427ffabf278fc6ea9484c97505e231166927a5
@@ -181,4 +187,4 @@ SPEC CHECKSUMS:
181187

182188
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
183189

184-
COCOAPODS: 1.15.2
190+
COCOAPODS: 1.16.2

‎pubspec.lock‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -823,11 +823,9 @@ packages:
823823
flutter_libsparkmobile:
824824
dependency: "direct main"
825825
description:
826-
path: "."
827-
ref: a5b90f613a7d0e77ec1089a7d95552cae4a58be6
828-
resolved-ref: a5b90f613a7d0e77ec1089a7d95552cae4a58be6
829-
url: "https://github.com/cypherstack/flutter_libsparkmobile.git"
830-
source: git
826+
path: "../flutter_libsparkmobile"
827+
relative: true
828+
source: path
831829
version: "0.0.2"
832830
flutter_lints:
833831
dependency: "direct dev"

‎scripts/app_config/templates/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@
9797
B98151802A674022009D013C /* mobileliblelantus.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mobileliblelantus.framework; path = ../crypto_plugins/flutter_liblelantus/scripts/macos/mobileliblelantus/mobileliblelantus.framework; sourceTree = "<group>"; };
9898
B98151832A674143009D013C /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
9999
BF5E76865ACB46314AC27D8F /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
100-
CEA2021C2BDD4D7100FE1D27 /* wownero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = wownero_libwallet2_api_c.dylib; sourceTree = "<group>"; };
101-
CEA2021F2BDD4F0B00FE1D27 /* monero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = monero_libwallet2_api_c.dylib; sourceTree = "<group>"; };
102-
E6036BF01BF05EA773C76D22 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
100+
E6036BF01BF05EA773C76D22 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
103101
F1FA2C4D2BA4B49F00BDA1BB /* frostdart.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = frostdart.dylib; path = ../crypto_plugins/frostdart/macos/frostdart.dylib; sourceTree = "<group>"; };
104102
F1FA2C4F2BA4B4CA00BDA1BB /* frostdart.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = frostdart.dylib; path = ../crypto_plugins/frostdart/macos/frostdart.dylib; sourceTree = "<group>"; };
105103
/* End PBXFileReference section */
@@ -149,9 +147,7 @@
149147
33CC10E42044A3C60003C045 = {
150148
isa = PBXGroup;
151149
children = (
152-
CEA2021F2BDD4F0B00FE1D27 /* monero_libwallet2_api_c.dylib */,
153-
CEA2021C2BDD4D7100FE1D27 /* wownero_libwallet2_api_c.dylib */,
154-
F1FA2C4F2BA4B4CA00BDA1BB /* frostdart.dylib */,
150+
F1FA2C4F2BA4B4CA00BDA1BB /* frostdart.dylib */,
155151
33FAB671232836740065AC1E /* Runner */,
156152
33CEB47122A05771004F2AC0 /* Flutter */,
157153
331C80D6294CF71000263BE5 /* RunnerTests */,
@@ -281,7 +277,7 @@
281277
isa = PBXProject;
282278
attributes = {
283279
LastSwiftUpdateCheck = 0920;
284-
LastUpgradeCheck = 1430;
280+
LastUpgradeCheck = 1510;
285281
ORGANIZATIONNAME = "";
286282
TargetAttributes = {
287283
331C80D4294CF70F00263BE5 = {
@@ -599,10 +595,7 @@
599595
"$(inherited)",
600596
"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
601597
"\"${PODS_CONFIGURATION_BUILD_DIR}/connectivity_plus\"",
602-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_monero\"",
603-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_shared_external\"",
604-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_wownero\"",
605-
"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
598+
"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
606599
"\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"",
607600
"\"${PODS_CONFIGURATION_BUILD_DIR}/devicelocale\"",
608601
"\"${PODS_CONFIGURATION_BUILD_DIR}/flutter_libepiccash\"",
@@ -627,10 +620,7 @@
627620
LIBRARY_SEARCH_PATHS = (
628621
"$(inherited)",
629622
"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
630-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_monero/macos/External/macos/lib\"",
631-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_shared_external/macos/External/macos/lib\"",
632-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_wownero/macos/External/macos/lib\"",
633-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
623+
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
634624
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos\"",
635625
/usr/lib/swift,
636626
"$(PATH)/crypto_plugins/frostdart/macos\n",
@@ -763,9 +753,6 @@
763753
"$(inherited)",
764754
"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
765755
"\"${PODS_CONFIGURATION_BUILD_DIR}/connectivity_plus\"",
766-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_monero\"",
767-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_shared_external\"",
768-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_wownero\"",
769756
"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
770757
"\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"",
771758
"\"${PODS_CONFIGURATION_BUILD_DIR}/devicelocale\"",
@@ -791,9 +778,6 @@
791778
LIBRARY_SEARCH_PATHS = (
792779
"$(inherited)",
793780
"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
794-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_monero/macos/External/macos/lib\"",
795-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_shared_external/macos/External/macos/lib\"",
796-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_wownero/macos/External/macos/lib\"",
797781
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
798782
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos\"",
799783
/usr/lib/swift,
@@ -818,9 +802,6 @@
818802
"$(inherited)",
819803
"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
820804
"\"${PODS_CONFIGURATION_BUILD_DIR}/connectivity_plus\"",
821-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_monero\"",
822-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_shared_external\"",
823-
"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_wownero\"",
824805
"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
825806
"\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"",
826807
"\"${PODS_CONFIGURATION_BUILD_DIR}/devicelocale\"",
@@ -846,10 +827,7 @@
846827
LIBRARY_SEARCH_PATHS = (
847828
"$(inherited)",
848829
"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
849-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_monero/macos/External/macos/lib\"",
850-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_shared_external/macos/External/macos/lib\"",
851-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_wownero/macos/External/macos/lib\"",
852-
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
830+
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
853831
"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos\"",
854832
/usr/lib/swift,
855833
"$(PATH)/crypto_plugins/frostdart/macos\n",

‎scripts/app_config/templates/pubspec.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
flutter_libsparkmobile:
3434
git:
3535
url: https://github.com/cypherstack/flutter_libsparkmobile.git
36-
ref: a5b90f613a7d0e77ec1089a7d95552cae4a58be6
36+
ref: 28d0f6c8db56a7d14d6495e810b8705a5c438929
3737

3838
# cs_monero compat (unpublished)
3939
compat:

0 commit comments

Comments
 (0)