diff --git a/ShhShell.xcodeproj/project.pbxproj b/ShhShell.xcodeproj/project.pbxproj index 0b867a7..df94f41 100644 --- a/ShhShell.xcodeproj/project.pbxproj +++ b/ShhShell.xcodeproj/project.pbxproj @@ -38,7 +38,7 @@ A93143C62DF61FE300FCD5DB /* ViewModifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = A93143C52DF61FE300FCD5DB /* ViewModifiers.swift */; }; A93F283D2E2A5DCB0092B8D5 /* SnippetManagerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A93F283C2E2A5DCB0092B8D5 /* SnippetManagerView.swift */; }; A93F28412E2A5EEA0092B8D5 /* Snippet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A93F28402E2A5EEA0092B8D5 /* Snippet.swift */; }; - A943305A2E7DE2A800244CFD /* openssl.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95FAA512DF4B62100DE2F5A /* openssl.xcframework */; settings = {ATTRIBUTES = (Required, ); }; }; + A94330602E7DE55900244CFD /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = A943305F2E7DE55900244CFD /* OpenSSL */; }; A9485C712E1AECD000209824 /* JetBrainsMonoNerdFontMono-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A9485C702E1AECD000209824 /* JetBrainsMonoNerdFontMono-Italic.ttf */; }; A9485C722E1AECD000209824 /* JetBrainsMonoNerdFontMono-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A9485C6E2E1AECD000209824 /* JetBrainsMonoNerdFontMono-Bold.ttf */; }; A9485C732E1AECD000209824 /* JetBrainsMonoNerdFontMono-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A9485C6F2E1AECD000209824 /* JetBrainsMonoNerdFontMono-BoldItalic.ttf */; }; @@ -189,7 +189,6 @@ A94B83302E5C79EE00EBA09C /* CRT.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = CRT.metal; sourceTree = ""; }; A95FAA462DF3884B00DE2F5A /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = SOURCE_ROOT; }; A95FAA502DF4B62100DE2F5A /* LibSSH.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = LibSSH.xcframework; path = Frameworks/LibSSH.xcframework; sourceTree = ""; }; - A95FAA512DF4B62100DE2F5A /* openssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = openssl.xcframework; path = Frameworks/openssl.xcframework; sourceTree = ""; }; A95FAA5A2DF4B79900DE2F5A /* ci_post_clone.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_post_clone.sh; sourceTree = ""; }; A95FAA5B2DF4B7A000DE2F5A /* ci_pre_xcodebuild.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_pre_xcodebuild.sh; sourceTree = ""; }; A95FAA5C2DF4B7A300DE2F5A /* ci_prost_xcodebuild.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_prost_xcodebuild.sh; sourceTree = ""; }; @@ -260,10 +259,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A94330602E7DE55900244CFD /* OpenSSL in Frameworks */, A91F9E762E674928009FCB3A /* SwiftTerm in Frameworks */, A99D9F7E2E6351D100259166 /* SwiftTerm in Frameworks */, A99D9F7B2E63513E00259166 /* SwiftTerm in Frameworks */, - A943305A2E7DE2A800244CFD /* openssl.xcframework in Frameworks */, A95FAA542DF4B62900DE2F5A /* LibSSH.xcframework in Frameworks */, A93143BE2DF4D0B300FCD5DB /* libpthread.tbd in Frameworks */, A9083E402DF2226F0042906E /* libz.tbd in Frameworks */, @@ -634,7 +633,6 @@ A93143BD2DF4D0A700FCD5DB /* libpthread.tbd */, A9083E3F2DF2225A0042906E /* libz.tbd */, A95FAA502DF4B62100DE2F5A /* LibSSH.xcframework */, - A95FAA512DF4B62100DE2F5A /* openssl.xcframework */, ); name = Frameworks; sourceTree = ""; @@ -702,6 +700,7 @@ A99D9F7A2E63513E00259166 /* SwiftTerm */, A99D9F7D2E6351D100259166 /* SwiftTerm */, A91F9E752E674928009FCB3A /* SwiftTerm */, + A943305F2E7DE55900244CFD /* OpenSSL */, ); productName = ShhShell; productReference = A925389A2DEE06DC007E0A18 /* ShhShell.app */; @@ -782,6 +781,7 @@ minimizedProjectReferenceProxies = 1; packageReferences = ( A91F9E742E674928009FCB3A /* XCLocalSwiftPackageReference "SwiftTerm" */, + A943305E2E7DE55000244CFD /* XCRemoteSwiftPackageReference "OpenSSL" */, ); productRefGroup = A925389B2DEE06DC007E0A18 /* Products */; projectDirPath = ""; @@ -1283,11 +1283,27 @@ }; /* End XCLocalSwiftPackageReference section */ +/* Begin XCRemoteSwiftPackageReference section */ + A943305E2E7DE55000244CFD /* XCRemoteSwiftPackageReference "OpenSSL" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/OuterCorner/OpenSSL"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.2.1; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + /* Begin XCSwiftPackageProductDependency section */ A91F9E752E674928009FCB3A /* SwiftTerm */ = { isa = XCSwiftPackageProductDependency; productName = SwiftTerm; }; + A943305F2E7DE55900244CFD /* OpenSSL */ = { + isa = XCSwiftPackageProductDependency; + package = A943305E2E7DE55000244CFD /* XCRemoteSwiftPackageReference "OpenSSL" */; + productName = OpenSSL; + }; A99D9F7A2E63513E00259166 /* SwiftTerm */ = { isa = XCSwiftPackageProductDependency; productName = SwiftTerm; diff --git a/ShhShell.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ShhShell.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3f52d8b..28fc156 100644 --- a/ShhShell.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ShhShell.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,6 +1,15 @@ { - "originHash" : "d415ccafb2cea88d848a27f2d46c96a1d9161addf9f04c1f3c88326f5d33b325", + "originHash" : "807dd6641a75807af36f6cce4ade2b3a6e5620dde706a944b733556e49cc3c3a", "pins" : [ + { + "identity" : "openssl", + "kind" : "remoteSourceControl", + "location" : "https://github.com/OuterCorner/OpenSSL", + "state" : { + "revision" : "331ee7092308d5a22163c176e682201b6e0eb9b4", + "version" : "1.2.1" + } + }, { "identity" : "swift-argument-parser", "kind" : "remoteSourceControl", diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index 3be2d87..14e8c93 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -12,6 +12,6 @@ git submodule init rm -rf SwiftTerm git clone https://github.com/neon443/SwiftTerm -b jelly mkdir Frameworks; cd Frameworks -curl -o frameworks.tar.xz https://files.catbox.moe/hd2s6n.xz +curl -o frameworks.tar.xz https://files.catbox.moe/buydq9.xz tar xzf frameworks.tar.xz rm frameworks.tar.xz