From fd34690d49d4d6e2cfc9d91923c671107e34cf60 Mon Sep 17 00:00:00 2001 From: Amir Mohammadi Date: Wed, 17 Jan 2024 15:43:38 +0330 Subject: [PATCH] switch to local spm --- ios/Package.swift | 27 +++++++++++++ ios/Runner.xcodeproj/project.pbxproj | 39 +++++++++++-------- .../xcshareddata/swiftpm/Package.resolved | 14 ------- 3 files changed, 50 insertions(+), 30 deletions(-) create mode 100644 ios/Package.swift delete mode 100644 ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/ios/Package.swift b/ios/Package.swift new file mode 100644 index 00000000..7092ac80 --- /dev/null +++ b/ios/Package.swift @@ -0,0 +1,27 @@ +// swift-tools-version: 5.4 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Libcore", + platforms: [ + // Minimum platform version + .iOS(.v13), + .tvOS(.v13) + ], + products: [ + .library( + name: "Libcore", + targets: ["Libcore"]), + ], + dependencies: [ + // No dependencies + ], + targets: [ + .binaryTarget( + name: "Libcore", + path: "Frameworks/Libcore.xcframework" + ) + ] + ) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 7e9e9829..3b1eabb8 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 54EA599BF9C050F2827533D5 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA50BDF2E5E5DDA3995F24D /* Pods_RunnerTests.framework */; }; - 684381112B572DBF00C06CAA /* Libcore in Frameworks */ = {isa = PBXBuildFile; productRef = 684381102B572DBF00C06CAA /* Libcore */; }; 68885DD72B4EF33400D214BA /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E392B72ADDA00E000ADF15 /* NetworkExtension.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -145,6 +144,7 @@ 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 574F12C7748958784380337F /* 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 = ""; }; 60F1D4AAC33ACF5C8307310D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 684A36452B57F55C00458C99 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; 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 = ""; }; @@ -170,7 +170,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 684381112B572DBF00C06CAA /* Libcore in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -306,6 +305,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( + 684A36452B57F55C00458C99 /* Package.swift */, 03E392CD2ADDE103000ADF15 /* Shared */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, @@ -401,7 +401,6 @@ ); name = SingBoxPacketTunnel; packageProductDependencies = ( - 684381102B572DBF00C06CAA /* Libcore */, ); productName = SingBoxPacketTunnel; productReference = 03E392B62ADDA00E000ADF15 /* SingBoxPacketTunnel.appex */; @@ -491,7 +490,6 @@ ); mainGroup = 97C146E51CF9000F007C117D; packageReferences = ( - 684380FC2B57068900C06CAA /* XCRemoteSwiftPackageReference "hiddify-next-core" */, ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; @@ -753,11 +751,14 @@ "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.ios.SingBoxPacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Debug; }; @@ -799,10 +800,12 @@ "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.ios.SingBoxPacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Release; }; @@ -844,10 +847,12 @@ "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.ios.SingBoxPacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 15.0; }; name = Profile; }; @@ -979,9 +984,11 @@ PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; @@ -1228,9 +1235,12 @@ PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.ios; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -1305,9 +1315,11 @@ PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)"; "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = com.hiddify.ios; PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -1369,11 +1381,6 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 684381102B572DBF00C06CAA /* Libcore */ = { - isa = XCSwiftPackageProductDependency; - package = 684380FC2B57068900C06CAA /* XCRemoteSwiftPackageReference "hiddify-next-core" */; - productName = Libcore; - }; 684381122B57335300C06CAA /* Libcore */ = { isa = XCSwiftPackageProductDependency; package = 684380FC2B57068900C06CAA /* XCRemoteSwiftPackageReference "hiddify-next-core" */; diff --git a/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 7d1b8084..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "hiddify-next-core", - "kind" : "remoteSourceControl", - "location" : "https://github.com/hiddify/hiddify-next-core.git", - "state" : { - "branch" : "main", - "revision" : "9d07cc8c70a5d04d64267ba60fa32755953bf06e" - } - } - ], - "version" : 2 -}