Merge pull request #1100 from cypherstack/apple_updates

Apple updates
2025-04-17 19:51:58 +00:00 · 2025-03-20 11:30:15 -06:00 · 2025-03-20 11:30:15 -06:00 · 574d0e82ff
commit 574d0e82ff
parent 7439dbf9fc 30dedee63f
9 changed files with 22 additions and 41 deletions
--- a/.gitignore
+++ b/.gitignore
@ -59,8 +59,6 @@ coverage
 scripts/**/build
 /lib/external_api_keys.dart

-libcw_monero.dll
-libcw_wownero.dll
 libepic_cash_wallet.dll
 libmobileliblelantus.dll
 libtor_ffi.dll
--- a/crypto_plugins/flutter_liblelantus
+++ b/crypto_plugins/flutter_liblelantus
@ -1 +1 @@
-Subproject commit 5b08645a5b5d30955f4bde2a624ff89ef516e452
+Subproject commit 89f05ee42754f80da036ddcf31c7b1e1dc3b4a83
--- a/crypto_plugins/frostdart
+++ b/crypto_plugins/frostdart
@ -1 +1 @@
-Subproject commit 2451deab817b456ad93d5579c0d0687cb681392a
+Subproject commit f111cdf183bec1c71c2b20cf265d3879a81f7903
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -215,7 +215,7 @@ SPEC CHECKSUMS:
  devicelocale: 35ba84dc7f45f527c3001535d8c8d104edd5d926
  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
+  file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
  flutter_libepiccash: 36241aa7d3126f6521529985ccb3dc5eaf7bb317
  flutter_libsparkmobile: 6373955cc3327a926d17059e7405dde2fb12f99f
@ -245,4 +245,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb

-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@ -48,6 +48,7 @@
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@ -15,6 +15,8 @@ PODS:
    - FlutterMacOS
  - devicelocale (0.0.1):
    - FlutterMacOS
+  - file_picker (0.0.1):
+    - FlutterMacOS
  - flutter_libepiccash (0.0.1):
    - FlutterMacOS
  - flutter_libsparkmobile (0.0.1):
@ -74,6 +76,7 @@ DEPENDENCIES:
  - desktop_drop (from `Flutter/ephemeral/.symlinks/plugins/desktop_drop/macos`)
  - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
  - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`)
+  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
  - flutter_libepiccash (from `Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos`)
  - flutter_libsparkmobile (from `Flutter/ephemeral/.symlinks/plugins/flutter_libsparkmobile/macos`)
  - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
@ -113,6 +116,8 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
  devicelocale:
    :path: Flutter/ephemeral/.symlinks/plugins/devicelocale/macos
+  file_picker:
+    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
  flutter_libepiccash:
    :path: Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos
  flutter_libsparkmobile:
@ -158,6 +163,7 @@ SPEC CHECKSUMS:
  desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
  device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
  devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
+  file_picker: e716a70a9fe5fd9e09ebc922d7541464289443af
  flutter_libepiccash: be1560a04150c5cc85bcf08d236ec2b3d1f5d8da
  flutter_libsparkmobile: df2d36af1691379c81249e7be7b68be3c81d388b
  flutter_local_notifications: 4b427ffabf278fc6ea9484c97505e231166927a5
@ -181,4 +187,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367

-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
--- a/pubspec.lock
+++ b/pubspec.lock
@ -823,11 +823,9 @@ packages:
  flutter_libsparkmobile:
    dependency: "direct main"
    description:
-      path: "."
-      ref: a5b90f613a7d0e77ec1089a7d95552cae4a58be6
-      resolved-ref: a5b90f613a7d0e77ec1089a7d95552cae4a58be6
-      url: "https://github.com/cypherstack/flutter_libsparkmobile.git"
-    source: git
+      path: "../flutter_libsparkmobile"
+      relative: true
+    source: path
    version: "0.0.2"
  flutter_lints:
    dependency: "direct dev"
--- a/scripts/app_config/templates/macos/Runner.xcodeproj/project.pbxproj
+++ b/scripts/app_config/templates/macos/Runner.xcodeproj/project.pbxproj
@ -97,9 +97,7 @@
 		B98151802A674022009D013C /* mobileliblelantus.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mobileliblelantus.framework; path = ../crypto_plugins/flutter_liblelantus/scripts/macos/mobileliblelantus/mobileliblelantus.framework; sourceTree = "<group>"; };
 		B98151832A674143009D013C /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
 		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>"; };
-		CEA2021C2BDD4D7100FE1D27 /* wownero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = wownero_libwallet2_api_c.dylib; sourceTree = "<group>"; };
-		CEA2021F2BDD4F0B00FE1D27 /* monero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = monero_libwallet2_api_c.dylib; sourceTree = "<group>"; };
-		E6036BF01BF05EA773C76D22 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+  		E6036BF01BF05EA773C76D22 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F1FA2C4D2BA4B49F00BDA1BB /* frostdart.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = frostdart.dylib; path = ../crypto_plugins/frostdart/macos/frostdart.dylib; sourceTree = "<group>"; };
 		F1FA2C4F2BA4B4CA00BDA1BB /* frostdart.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = frostdart.dylib; path = ../crypto_plugins/frostdart/macos/frostdart.dylib; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@ -149,9 +147,7 @@
 		33CC10E42044A3C60003C045 = {
 			isa = PBXGroup;
 			children = (
-				CEA2021F2BDD4F0B00FE1D27 /* monero_libwallet2_api_c.dylib */,
-				CEA2021C2BDD4D7100FE1D27 /* wownero_libwallet2_api_c.dylib */,
-				F1FA2C4F2BA4B4CA00BDA1BB /* frostdart.dylib */,
+ 				F1FA2C4F2BA4B4CA00BDA1BB /* frostdart.dylib */,
 				33FAB671232836740065AC1E /* Runner */,
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				331C80D6294CF71000263BE5 /* RunnerTests */,
@ -281,7 +277,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80D4294CF70F00263BE5 = {
@ -599,10 +595,7 @@
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/connectivity_plus\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_monero\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_shared_external\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_wownero\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
+ 					"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/devicelocale\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/flutter_libepiccash\"",
@ -627,10 +620,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_monero/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_shared_external/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_wownero/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
+ 					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
 					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos\"",
 					/usr/lib/swift,
 					"$(PATH)/crypto_plugins/frostdart/macos\n",
@ -763,9 +753,6 @@
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/connectivity_plus\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_monero\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_shared_external\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_wownero\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/devicelocale\"",
@ -791,9 +778,6 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_monero/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_shared_external/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_wownero/macos/External/macos/lib\"",
 					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
 					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos\"",
 					/usr/lib/swift,
@ -818,9 +802,6 @@
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/connectivity_plus\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_monero\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_shared_external\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/cw_wownero\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/desktop_drop\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/devicelocale\"",
@ -846,10 +827,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_monero/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_shared_external/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/cw_wownero/macos/External/macos/lib\"",
-					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
+ 					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/flutter_libepiccash/macos/libs\"",
 					"\"${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/isar_flutter_libs/macos\"",
 					/usr/lib/swift,
 					"$(PATH)/crypto_plugins/frostdart/macos\n",
--- a/scripts/app_config/templates/pubspec.template
+++ b/scripts/app_config/templates/pubspec.template
@ -33,7 +33,7 @@ dependencies:
  flutter_libsparkmobile:
    git:
      url: https://github.com/cypherstack/flutter_libsparkmobile.git
-      ref: a5b90f613a7d0e77ec1089a7d95552cae4a58be6
+      ref: 28d0f6c8db56a7d14d6495e810b8705a5c438929

  # cs_monero compat (unpublished)
  compat: