Skip to content

Apple updates #1100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julian-CStack merged 4 commits into from
Mar 20, 2025
Merged

Apple updates #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbc805e
update liblelantus submodule
julian-CStack Mar 13, 2025
709eebc
update frostdart submodule
julian-CStack Mar 13, 2025
08c5a5f
macos tweaks and updates
julian-CStack Mar 13, 2025
30dedee
ios tweaks and updates
julian-CStack Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crypto_plugins/flutter_liblelantus
Open in desktop
Submodule flutter_liblelantus updated 2 files
+5 −1 scripts/ios/build_lib.sh
+1 −1 scripts/ios/build_openssl.sh
2 changes: 1 addition & 1 deletion crypto_plugins/frostdart
Open in desktop
Submodule frostdart updated 14 files
+3 −3 cargokit/.github/workflows/check_and_lint.yml
+6 −2 cargokit/.github/workflows/test_example_plugin_build.yml
+5 −1 cargokit/gradle/plugin.gradle
+5 −0 cargokit/run_build_tool.sh
+3 −0 example/.gitignore
+1 −1 example/ios/Podfile
+127 −19 example/ios/Runner.xcodeproj/project.pbxproj
+1 −1 example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+1 −1 example/ios/Runner/AppDelegate.swift
+1 −1 example/macos/Podfile.lock
+1 −1 example/macos/Runner.xcodeproj/project.pbxproj
+1 −1 example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+5 −1 example/macos/Runner/AppDelegate.swift
+16 −16 example/pubspec.lock
4 changes: 2 additions & 2 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -245,4 +245,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
1 change: 1 addition & 0 deletions ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
8 changes: 7 additions & 1 deletion macos/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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`)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -181,4 +187,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
8 changes: 3 additions & 5 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
34 changes: 6 additions & 28 deletions scripts/app_config/templates/macos/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -281,7 +277,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C80D4294CF70F00263BE5 = {
Expand Down Expand Up @@ -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\"",
Expand All @@ -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",
Expand Down Expand Up @@ -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\"",
Expand All @@ -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,
Expand All @@ -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\"",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scripts/app_config/templates/pubspec.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading