From 6462943636bdc373eabe764ee66585d9b8bc4131 Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Tue, 23 Sep 2025 10:11:08 +0100 Subject: [PATCH] update openssl.xcframework, recompiled with iphoneos26.0sdk update icon --- Resources/ShhShell.icon/icon.json | 6 ++--- ShhShell.xcodeproj/project.pbxproj | 24 ++++--------------- .../xcshareddata/swiftpm/Package.resolved | 11 +-------- ci_scripts/ci_post_clone.sh | 2 +- 4 files changed, 9 insertions(+), 34 deletions(-) diff --git a/Resources/ShhShell.icon/icon.json b/Resources/ShhShell.icon/icon.json index 4440d8f..0fceb9c 100644 --- a/Resources/ShhShell.icon/icon.json +++ b/Resources/ShhShell.icon/icon.json @@ -12,7 +12,7 @@ "opacity" : 0.4 }, { - "glass" : false, + "glass" : true, "image-name" : "$.png", "name" : "$", "position" : { @@ -24,7 +24,7 @@ } }, { - "glass" : false, + "glass" : true, "image-name" : ">.png", "name" : ">", "position" : { @@ -36,7 +36,7 @@ } }, { - "glass" : false, + "glass" : true, "image-name" : "▮.png", "name" : "▮", "position" : { diff --git a/ShhShell.xcodeproj/project.pbxproj b/ShhShell.xcodeproj/project.pbxproj index 004a54e..f55f0a9 100644 --- a/ShhShell.xcodeproj/project.pbxproj +++ b/ShhShell.xcodeproj/project.pbxproj @@ -38,7 +38,6 @@ 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 */; }; - A94330632E7DEEB200244CFD /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = A94330622E7DEEB200244CFD /* 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 */; }; @@ -49,6 +48,7 @@ A95FAA472DF3884B00DE2F5A /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = A95FAA462DF3884B00DE2F5A /* Config.xcconfig */; }; A95FAA542DF4B62900DE2F5A /* LibSSH.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A95FAA502DF4B62100DE2F5A /* LibSSH.xcframework */; }; A95FAA552DF4B62900DE2F5A /* LibSSH.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A95FAA502DF4B62100DE2F5A /* LibSSH.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + A96A6A912E829C680084E249 /* OpenSSL-1.1.1m.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A96A6A902E829C680084E249 /* OpenSSL-1.1.1m.xcframework */; }; A96BE6972E10846B00C0FEE9 /* catppuccinMocha.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE68D2E10846B00C0FEE9 /* catppuccinMocha.plist */; }; A96BE6982E10846B00C0FEE9 /* ubuntu.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6932E10846B00C0FEE9 /* ubuntu.plist */; }; A96BE6992E10846B00C0FEE9 /* iTerm2SolarizedDark.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96BE6902E10846B00C0FEE9 /* iTerm2SolarizedDark.plist */; }; @@ -192,6 +192,7 @@ 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 = ""; }; + A96A6A902E829C680084E249 /* OpenSSL-1.1.1m.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "OpenSSL-1.1.1m.xcframework"; path = "Frameworks/OpenSSL-1.1.1m.xcframework"; sourceTree = ""; }; A96BE68B2E10846B00C0FEE9 /* 0x96f.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = 0x96f.plist; sourceTree = ""; }; A96BE68C2E10846B00C0FEE9 /* catppuccinFrappe.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = catppuccinFrappe.plist; sourceTree = ""; }; A96BE68D2E10846B00C0FEE9 /* catppuccinMocha.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = catppuccinMocha.plist; sourceTree = ""; }; @@ -259,12 +260,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A94330632E7DEEB200244CFD /* OpenSSL in Frameworks */, A91F9E762E674928009FCB3A /* SwiftTerm in Frameworks */, A99D9F7E2E6351D100259166 /* SwiftTerm in Frameworks */, A99D9F7B2E63513E00259166 /* SwiftTerm in Frameworks */, A95FAA542DF4B62900DE2F5A /* LibSSH.xcframework in Frameworks */, A93143BE2DF4D0B300FCD5DB /* libpthread.tbd in Frameworks */, + A96A6A912E829C680084E249 /* OpenSSL-1.1.1m.xcframework in Frameworks */, A9083E402DF2226F0042906E /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -633,6 +634,7 @@ A93143BD2DF4D0A700FCD5DB /* libpthread.tbd */, A9083E3F2DF2225A0042906E /* libz.tbd */, A95FAA502DF4B62100DE2F5A /* LibSSH.xcframework */, + A96A6A902E829C680084E249 /* OpenSSL-1.1.1m.xcframework */, ); name = Frameworks; sourceTree = ""; @@ -700,7 +702,6 @@ A99D9F7A2E63513E00259166 /* SwiftTerm */, A99D9F7D2E6351D100259166 /* SwiftTerm */, A91F9E752E674928009FCB3A /* SwiftTerm */, - A94330622E7DEEB200244CFD /* OpenSSL */, ); productName = ShhShell; productReference = A925389A2DEE06DC007E0A18 /* ShhShell.app */; @@ -781,7 +782,6 @@ minimizedProjectReferenceProxies = 1; packageReferences = ( A91F9E742E674928009FCB3A /* XCLocalSwiftPackageReference "SwiftTerm" */, - A94330612E7DEEB200244CFD /* XCRemoteSwiftPackageReference "OpenSSL-apple" */, ); productRefGroup = A925389B2DEE06DC007E0A18 /* Products */; projectDirPath = ""; @@ -1283,27 +1283,11 @@ }; /* End XCLocalSwiftPackageReference section */ -/* Begin XCRemoteSwiftPackageReference section */ - A94330612E7DEEB200244CFD /* XCRemoteSwiftPackageReference "OpenSSL-apple" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/neon443/OpenSSL-apple"; - requirement = { - branch = master; - kind = branch; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - /* Begin XCSwiftPackageProductDependency section */ A91F9E752E674928009FCB3A /* SwiftTerm */ = { isa = XCSwiftPackageProductDependency; productName = SwiftTerm; }; - A94330622E7DEEB200244CFD /* OpenSSL */ = { - isa = XCSwiftPackageProductDependency; - package = A94330612E7DEEB200244CFD /* XCRemoteSwiftPackageReference "OpenSSL-apple" */; - 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 47445dc..3f52d8b 100644 --- a/ShhShell.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ShhShell.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,15 +1,6 @@ { - "originHash" : "f4ad8e58bb8b53ab8aa996385b70be78cf2053720383c9626b005909c993d418", + "originHash" : "d415ccafb2cea88d848a27f2d46c96a1d9161addf9f04c1f3c88326f5d33b325", "pins" : [ - { - "identity" : "openssl-apple", - "kind" : "remoteSourceControl", - "location" : "https://github.com/neon443/OpenSSL-apple", - "state" : { - "branch" : "master", - "revision" : "89e3523483b5b0a0724f8e09df752980e5e12a13" - } - }, { "identity" : "swift-argument-parser", "kind" : "remoteSourceControl", diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index 14e8c93..cdfa8e0 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/buydq9.xz +curl -o frameworks.tar.xz https://files.catbox.moe/f4pe0u.xz tar xzf frameworks.tar.xz rm frameworks.tar.xz