From fe77b958f6c47beae82e832c89329849c34ecdcd Mon Sep 17 00:00:00 2001 From: Zeus Date: Wed, 24 Jul 2024 12:44:24 +0800 Subject: [PATCH] fix build bugs fix build bugs --- .DS_Store | Bin 6148 -> 6148 bytes source/ios/Podfile | 11 +- source/ios/Runner.xcodeproj/project.pbxproj | 119 +++++++----------- .../xcshareddata/swiftpm/Package.resolved | 14 +++ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ++ .../xcshareddata/swiftpm/Package.resolved | 14 +++ 6 files changed, 92 insertions(+), 74 deletions(-) create mode 100644 source/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 source/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 source/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.DS_Store b/.DS_Store index 1e8e7498694fdf2d1f5b51ac53b4020200e4edb3..bc707eff1504f94523e73b320a2961856d8ca39b 100644 GIT binary patch delta 46 zcmZoMXffEJ!p69B5^Ev1WOcQPk%f+eu94;B1#B{m-IMpS$ustBzRRY`xS5^fFFycA CE)Eg^ delta 45 zcmZoMXffEJ!p68`5^EusM0K^ffuW9qrP1VtY%+{pllQU7Gj?yj$EL}+nT_KgKL9$? B4c!0$ diff --git a/source/ios/Podfile b/source/ios/Podfile index 64e92d1..83e5af1 100644 --- a/source/ios/Podfile +++ b/source/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '12.0' + # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -25,15 +25,20 @@ def flutter_root raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" end + +# 添加打印语句 +puts "Flutter Root Path: #{flutter_root}" + require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + + flutter_ios_podfile_setup target 'Runner' do use_frameworks! use_modular_headers! -# pod 'Leaf', :path => 'leaf.xcframework' - + puts "flutter_install_all_ios_pods : #{File.dirname(File.realpath(__FILE__))}" flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end diff --git a/source/ios/Runner.xcodeproj/project.pbxproj b/source/ios/Runner.xcodeproj/project.pbxproj index 7cda4c0..ac4ddcb 100644 --- a/source/ios/Runner.xcodeproj/project.pbxproj +++ b/source/ios/Runner.xcodeproj/project.pbxproj @@ -7,9 +7,11 @@ objects = { /* Begin PBXBuildFile section */ + 1273FB492B1EBCA4005B78AF /* leaf.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1273FB472B1EBC5E005B78AF /* leaf.xcframework */; }; + 1273FB4A2B1EBCA4005B78AF /* leaf.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1273FB472B1EBC5E005B78AF /* leaf.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 2FD21F1125A363E300F556E0 /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FD21F1025A363E300F556E0 /* PacketTunnelProvider.swift */; }; - 2FD21F1625A363E300F556E0 /* PacketTunnel.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 2FD21F0D25A363E300F556E0 /* PacketTunnel.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 2FD21F1625A363E300F556E0 /* PacketTunnel.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 2FD21F0D25A363E300F556E0 /* PacketTunnel.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 2FD21F2425A364B700F556E0 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2FD21EF825A363AA00F556E0 /* NetworkExtension.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3E06F985293FACBB00E04D92 /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FD21F1025A363E300F556E0 /* PacketTunnelProvider.swift */; }; @@ -32,12 +34,8 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - C09C70752C3E5685000F6E01 /* leaf.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0CB10F52C3275EE00A1F217 /* leaf.xcframework */; }; - C09C70762C3E5685000F6E01 /* leaf.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C0CB10F52C3275EE00A1F217 /* leaf.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - C09CB0812C50A09A0028C461 /* TESWT.m in Sources */ = {isa = PBXBuildFile; fileRef = C09CB0802C50A09A0028C461 /* TESWT.m */; }; - C0CB10F62C3275EE00A1F217 /* leaf.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0CB10F52C3275EE00A1F217 /* leaf.xcframework */; }; + C09CB0942C50BC8D0028C461 /* leaf.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1273FB472B1EBC5E005B78AF /* leaf.xcframework */; }; DBC6F25A26C78B1D91884CE1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9C0075B77637136AF52D8B /* Pods_Runner.framework */; }; - E2B5FEC68AAAE043A3080A59 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9C0075B77637136AF52D8B /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -51,15 +49,26 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 2FD21F0625A363AA00F556E0 /* Embed Foundation Extensions */ = { + 1273FB4B2B1EBCA4005B78AF /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; - buildActionMask = 12; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 1273FB4A2B1EBCA4005B78AF /* leaf.xcframework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + 2FD21F0625A363AA00F556E0 /* Embed App Extensions */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 13; files = ( - 2FD21F1625A363E300F556E0 /* PacketTunnel.appex in Embed Foundation Extensions */, + 2FD21F1625A363E300F556E0 /* PacketTunnel.appex in Embed App Extensions */, ); - name = "Embed Foundation Extensions"; + name = "Embed App Extensions"; runOnlyForDeploymentPostprocessing = 0; }; 9705A1C41CF9048500538489 /* Embed Frameworks */ = { @@ -72,29 +81,10 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - C09C70772C3E5685000F6E01 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - C09C70762C3E5685000F6E01 /* leaf.xcframework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - C0DAE5F52C3272280023769C /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 7; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 1273FB472B1EBC5E005B78AF /* leaf.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = leaf.xcframework; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 2F50954A25A36FD0001A32D5 /* VPNManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNManager.swift; sourceTree = ""; }; @@ -112,6 +102,7 @@ 3EA6B277293F1D1600B2BABC /* URL+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Helpers.swift"; sourceTree = ""; }; 3EA6B279293F1FAD00B2BABC /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; 4A9C0075B77637136AF52D8B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7F9A79C99E6BB92BFA8F918D /* 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 = ""; }; @@ -124,10 +115,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C09CB07F2C50A09A0028C461 /* TESWT.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TESWT.h; sourceTree = ""; }; - C09CB0802C50A09A0028C461 /* TESWT.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TESWT.m; sourceTree = ""; }; - C09CB0832C50A0DD0028C461 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - C0CB10F52C3275EE00A1F217 /* leaf.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = leaf.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -136,7 +123,7 @@ buildActionMask = 2147483647; files = ( 7A31DD8228420C0B00E82EE1 /* NetworkExtension.framework in Frameworks */, - C09C70752C3E5685000F6E01 /* leaf.xcframework in Frameworks */, + 1273FB492B1EBCA4005B78AF /* leaf.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -144,10 +131,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C0CB10F62C3275EE00A1F217 /* leaf.xcframework in Frameworks */, 2FD21F2425A364B700F556E0 /* NetworkExtension.framework in Frameworks */, DBC6F25A26C78B1D91884CE1 /* Pods_Runner.framework in Frameworks */, - E2B5FEC68AAAE043A3080A59 /* Pods_Runner.framework in Frameworks */, + C09CB0942C50BC8D0028C461 /* leaf.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -240,9 +226,7 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, - C09CB0832C50A0DD0028C461 /* Runner-Bridging-Header.h */, - C09CB07F2C50A09A0028C461 /* TESWT.h */, - C09CB0802C50A09A0028C461 /* TESWT.m */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, ); path = Runner; sourceTree = ""; @@ -250,7 +234,7 @@ F6BCB37E43B89DAB5A76B9D0 /* Frameworks */ = { isa = PBXGroup; children = ( - C0CB10F52C3275EE00A1F217 /* leaf.xcframework */, + 1273FB472B1EBC5E005B78AF /* leaf.xcframework */, 2FD21EF825A363AA00F556E0 /* NetworkExtension.framework */, 4A9C0075B77637136AF52D8B /* Pods_Runner.framework */, ); @@ -266,9 +250,8 @@ buildPhases = ( 2FD21F0925A363E300F556E0 /* Sources */, 2FD21F0A25A363E300F556E0 /* Frameworks */, - C0DAE5F52C3272280023769C /* CopyFiles */, 2FD21F0B25A363E300F556E0 /* Resources */, - C09C70772C3E5685000F6E01 /* Embed Frameworks */, + 1273FB4B2B1EBCA4005B78AF /* Embed Frameworks */, ); buildRules = ( ); @@ -284,14 +267,14 @@ buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( 4A4528B4E4B302F57B5EDB65 /* [CP] Check Pods Manifest.lock */, - 2FD21F0625A363AA00F556E0 /* Embed Foundation Extensions */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 30B17F94E53B12A0859D0A8C /* [CP] Embed Pods Frameworks */, + 2FD21F0625A363AA00F556E0 /* Embed App Extensions */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 9740EEB61CF901F6004384FC /* Run Script */, + 30B17F94E53B12A0859D0A8C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -309,7 +292,6 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1230; LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; @@ -332,6 +314,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + C09CB0932C50B5DF0028C461 /* XCRemoteSwiftPackageReference "SwiftLoader" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -434,7 +419,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; + shellScript = "\necho \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\"\necho build\necho \">>>>>>>>>\"\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -462,7 +447,6 @@ 3EA6B280293F6AB900B2BABC /* URL+Helpers.swift in Sources */, 3EA6B27F293F6AB500B2BABC /* FileManager+Helpers.swift in Sources */, 3EA6B27C293F68B500B2BABC /* VPNManager.swift in Sources */, - C09CB0812C50A09A0028C461 /* TESWT.m in Sources */, 3E06F989293FAFC600E04D92 /* LeafAdapter.swift in Sources */, 3E06F985293FACBB00E04D92 /* PacketTunnelProvider.swift in Sources */, 3E06F98C293FB8F600E04D92 /* TunnelConfiguration.swift in Sources */, @@ -523,7 +507,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -535,7 +518,6 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -565,19 +547,15 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 222; DEVELOPMENT_TEAM = 26XWXKSR3B; ENABLE_BITCODE = NO; - ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)", ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = UUVPN; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -586,7 +564,6 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; MODULEMAP_FILE = "${PROJECT_DIR}/LeafFFI/module.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = com.vpntunnel.vpnzeus; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -595,6 +572,7 @@ SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_INCLUDE_PATHS = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; @@ -747,7 +725,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -759,7 +736,6 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -807,7 +783,6 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -819,7 +794,6 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -851,19 +825,15 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 222; DEVELOPMENT_TEAM = 26XWXKSR3B; ENABLE_BITCODE = NO; - ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)", ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = UUVPN; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -872,7 +842,6 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; MODULEMAP_FILE = "${PROJECT_DIR}/LeafFFI/module.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = com.vpntunnel.vpnzeus; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -881,6 +850,7 @@ SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_INCLUDE_PATHS = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -898,19 +868,15 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 222; DEVELOPMENT_TEAM = 26XWXKSR3B; ENABLE_BITCODE = NO; - ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", - "$(PROJECT_DIR)", ); INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = UUVPN; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -919,7 +885,6 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 2.0.0; MODULEMAP_FILE = "${PROJECT_DIR}/LeafFFI/module.modulemap"; PRODUCT_BUNDLE_IDENTIFIER = com.vpntunnel.vpnzeus; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -928,6 +893,7 @@ SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_INCLUDE_PATHS = ""; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; @@ -968,6 +934,17 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + C09CB0932C50B5DF0028C461 /* XCRemoteSwiftPackageReference "SwiftLoader" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/leoru/SwiftLoader"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.0.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/source/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/source/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..a8f7ceb --- /dev/null +++ b/source/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "swiftloader", + "kind" : "remoteSourceControl", + "location" : "https://github.com/leoru/SwiftLoader", + "state" : { + "revision" : "3d03ac07764075bfab4c9ce9d5ba4556d6af350e", + "version" : "1.1.0" + } + } + ], + "version" : 2 +} diff --git a/source/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/source/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/source/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/source/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/source/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..a8f7ceb --- /dev/null +++ b/source/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "swiftloader", + "kind" : "remoteSourceControl", + "location" : "https://github.com/leoru/SwiftLoader", + "state" : { + "revision" : "3d03ac07764075bfab4c9ce9d5ba4556d6af350e", + "version" : "1.1.0" + } + } + ], + "version" : 2 +}