diff --git a/veilid-flutter/example/ios/Podfile.lock b/veilid-flutter/example/ios/Podfile.lock index 354e416b..c72712f5 100644 --- a/veilid-flutter/example/ios/Podfile.lock +++ b/veilid-flutter/example/ios/Podfile.lock @@ -1,21 +1,27 @@ PODS: - Flutter (1.0.0) + - path_provider_ios (0.0.1): + - Flutter - veilid (0.0.1): - Flutter DEPENDENCIES: - Flutter (from `Flutter`) + - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - veilid (from `.symlinks/plugins/veilid/ios`) EXTERNAL SOURCES: Flutter: :path: Flutter + path_provider_ios: + :path: ".symlinks/plugins/path_provider_ios/ios" veilid: :path: ".symlinks/plugins/veilid/ios" SPEC CHECKSUMS: Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - veilid: c3ddd66ae3c95c8ad925c02e403d38c8809f762c + path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 + veilid: 9141c973879377a5ce4f659b227ec01f0d687530 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c diff --git a/veilid-flutter/example/ios/Runner.xcodeproj/project.pbxproj b/veilid-flutter/example/ios/Runner.xcodeproj/project.pbxproj index d41010e1..6187169d 100644 --- a/veilid-flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/veilid-flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -225,7 +225,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; A5D76AF0FD12267359F0B3A4 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; diff --git a/veilid-flutter/example/macos/Podfile.lock b/veilid-flutter/example/macos/Podfile.lock index 811c652c..15a08438 100644 --- a/veilid-flutter/example/macos/Podfile.lock +++ b/veilid-flutter/example/macos/Podfile.lock @@ -1,20 +1,26 @@ PODS: - FlutterMacOS (1.0.0) + - path_provider_macos (0.0.1): + - FlutterMacOS - veilid (0.0.1): - FlutterMacOS DEPENDENCIES: - FlutterMacOS (from `Flutter/ephemeral`) + - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - veilid (from `Flutter/ephemeral/.symlinks/plugins/veilid/macos`) EXTERNAL SOURCES: FlutterMacOS: :path: Flutter/ephemeral + path_provider_macos: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos veilid: :path: Flutter/ephemeral/.symlinks/plugins/veilid/macos SPEC CHECKSUMS: FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 + path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f veilid: f6b04d095ac7058ddf9c00215eb2699de8cc4673 PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c diff --git a/veilid-flutter/ios/veilid.podspec b/veilid-flutter/ios/veilid.podspec index 8c2ab677..f600a07c 100644 --- a/veilid-flutter/ios/veilid.podspec +++ b/veilid-flutter/ios/veilid.podspec @@ -26,7 +26,7 @@ Veilid Network Plugin cargo_target_dir = File.join(File.dirname(JSON.parse(`cargo locate-project`)['root']), 'target') s.xcconfig = { - 'OTHER_LDFLAGS' => '-lveilid_flutter', + 'OTHER_LDFLAGS' => "-Wl,-force_load,#{File.join(cargo_target_dir, 'ios_lib', 'libveilid_flutter.a')}", "LIBRARY_SEARCH_PATHS" => File.join(cargo_target_dir, 'ios_lib') } diff --git a/veilid-flutter/macos/veilid.podspec b/veilid-flutter/macos/veilid.podspec index 561e52f3..8cf1b4b1 100644 --- a/veilid-flutter/macos/veilid.podspec +++ b/veilid-flutter/macos/veilid.podspec @@ -31,19 +31,4 @@ Veilid Network Plugin :output_files => [ File.join(cargo_target_dir, 'macos_lib', 'libveilid_flutter.dylib') ] } - # s.prepare_command = <<-CMD - # mkdir -p lib/Release/ - # cp /dev/null lib/Release/libveilid_flutter.dylib - # CMD - - # require 'json' - # require 'pathname' - # rust_dylib_absolute = File.join(File.dirname(JSON.parse(`cargo locate-project`)['root']), 'target', 'x86_64-apple-darwin', 'release', 'libveilid_flutter.dylib') - # rust_dylib_relative = Pathname.new(rust_dylib_absolute).relative_path_from(Pathname.new(Dir.pwd)).to_s - # require 'pp' - # print 'Rust dylib: ' - # pp rust_dylib_relative - # s.vendored_libraries = 'lib/Release/libveilid_flutter.dylib' - # s.libraries = [ 'veilid_flutter' ] - end