Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 2.0 (1) & (2) #1

Merged
merged 6 commits into from
Jul 13, 2023
Merged

Version 2.0 (1) & (2) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
225e2d6
Removed macOSX
ActuallyTaylor Jul 2, 2023
d5cebf1
Odd
ActuallyTaylor Jul 10, 2023
7de03d1
Updated to main TreeSitter
ActuallyTaylor Jul 12, 2023
6e50450
Updated Jellycore
ActuallyTaylor Jul 13, 2023
8668299
Version that uploades to the app store
ActuallyTaylor Jul 13, 2023
7cad3e3
Added encryption key
ActuallyTaylor Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Actions/Actions.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.jellycuts</string>
</array>
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>
36 changes: 18 additions & 18 deletions Jellycuts.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
DB4680DA2A147AAC003964CC /* JellycutsDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB4680D92A147AAC003964CC /* JellycutsDocument.swift */; };
DB4680DC2A147AAC003964CC /* DocumentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB4680DB2A147AAC003964CC /* DocumentView.swift */; };
DB4680DE2A147AAD003964CC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DB4680DD2A147AAD003964CC /* Assets.xcassets */; };
DB4680E32A147AAD003964CC /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DB4680E22A147AAD003964CC /* Preview Assets.xcassets */; };
DB4680F02A147FB7003964CC /* Jellycuts.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DB4680EE2A147FB7003964CC /* Jellycuts.xcdatamodeld */; };
DB4680F22A1480E5003964CC /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB4680F12A1480E5003964CC /* HomeView.swift */; };
DB4681142A148131003964CC /* Persistance.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB4681132A148131003964CC /* Persistance.swift */; };
Expand Down Expand Up @@ -85,7 +84,7 @@
DBF311072A255B540003606E /* ArrayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBF311062A255B540003606E /* ArrayView.swift */; };
DBFC1F102A292DAF00A8EE67 /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBF216872A27B8F50089B889 /* Intents.framework */; };
DBFC1F132A292DAF00A8EE67 /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBFC1F122A292DAF00A8EE67 /* IntentHandler.swift */; };
DBFC1F172A292DAF00A8EE67 /* Actions.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = DBFC1F0F2A292DAF00A8EE67 /* Actions.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
DBFC1F172A292DAF00A8EE67 /* Actions.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = DBFC1F0F2A292DAF00A8EE67 /* Actions.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
DBFC1F1C2A292DEE00A8EE67 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DBFC1F1B2A292DEE00A8EE67 /* Intents.intentdefinition */; };
DBFC1F1D2A292DF500A8EE67 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = DBFC1F1B2A292DEE00A8EE67 /* Intents.intentdefinition */; };
DBFC1F1F2A292E9400A8EE67 /* GetShortcutHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBFC1F1E2A292E9400A8EE67 /* GetShortcutHandler.swift */; };
Expand Down Expand Up @@ -138,7 +137,6 @@
DB4680DD2A147AAD003964CC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
DB4680DF2A147AAD003964CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DB4680E02A147AAD003964CC /* Jellycuts.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Jellycuts.entitlements; sourceTree = "<group>"; };
DB4680E22A147AAD003964CC /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
DB4680EF2A147FB7003964CC /* Jellycuts.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Jellycuts.xcdatamodel; sourceTree = "<group>"; };
DB4680F12A1480E5003964CC /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
DB4681132A148131003964CC /* Persistance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistance.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -349,7 +347,6 @@
isa = PBXGroup;
children = (
DB4680DD2A147AAD003964CC /* Assets.xcassets */,
DB4680E22A147AAD003964CC /* Preview Assets.xcassets */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -641,7 +638,6 @@
mainGroup = DB4680CB2A147AAC003964CC;
packageReferences = (
DB4681182A1483D6003964CC /* XCRemoteSwiftPackageReference "HydrogenReporter" */,
DB4EAFB42A19A00100B44F4D /* XCRemoteSwiftPackageReference "tree-sitter-spm" */,
DBF310FD2A2540C10003606E /* XCRemoteSwiftPackageReference "keychain-swift" */,
DB6609512A316238001431B2 /* XCRemoteSwiftPackageReference "BetterSafariView" */,
DBB068912A341032004D522C /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */,
Expand All @@ -662,7 +658,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DB4680E32A147AAD003964CC /* Preview Assets.xcassets in Resources */,
DB4680DE2A147AAD003964CC /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -767,6 +762,7 @@
/* Begin PBXTargetDependency section */
DBFC1F162A292DAF00A8EE67 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
platformFilter = ios;
target = DBFC1F0E2A292DAF00A8EE67 /* Actions */;
targetProxy = DBFC1F152A292DAF00A8EE67 /* PBXContainerItemProxy */;
};
Expand Down Expand Up @@ -806,6 +802,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -864,6 +861,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -889,11 +887,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_STANDALONE_ICON_BEHAVIOR = all;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Jellycuts/Jellycuts.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Jellycuts/Resources\"";
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 825FPALDZ5;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -922,7 +922,9 @@
PRODUCT_BUNDLE_IDENTIFIER = com.zlineman.Jellyfish;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_INSTALL_OBJC_HEADER = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
Expand All @@ -940,11 +942,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_STANDALONE_ICON_BEHAVIOR = all;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Jellycuts/Jellycuts.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Jellycuts/Resources\"";
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = 825FPALDZ5;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -973,7 +977,9 @@
PRODUCT_BUNDLE_IDENTIFIER = com.zlineman.Jellyfish;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_INSTALL_OBJC_HEADER = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
Expand Down Expand Up @@ -1005,6 +1011,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -1033,6 +1040,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -1081,14 +1089,6 @@
kind = branch;
};
};
DB4EAFB42A19A00100B44F4D /* XCRemoteSwiftPackageReference "tree-sitter-spm" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ActuallyTaylor/tree-sitter-spm";
requirement = {
branch = master;
kind = branch;
};
};
DB6609512A316238001431B2 /* XCRemoteSwiftPackageReference "BetterSafariView" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/stleamist/BetterSafariView";
Expand Down
4 changes: 2 additions & 2 deletions Jellycuts.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
},
{
"package": "TreeSitter",
"repositoryURL": "https://github.com/ActuallyTaylor/tree-sitter-spm",
"repositoryURL": "https://github.com/tree-sitter/tree-sitter",
"state": {
"branch": "master",
"revision": "3860f9e8c683a730a53cd6fd594ff2d8cdc4c222",
"revision": "9fd128ed604bb63348281bd4ac0d99705e713147",
"version": null
}
}
Expand Down
4 changes: 2 additions & 2 deletions Jellycuts.xcodeproj/xcuserdata/taylorlineman.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<key>Actions.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>2</integer>
</dict>
<key>Jellycuts.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
Expand Down
2 changes: 2 additions & 0 deletions Jellycuts/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
</array>
</dict>
</array>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>NSUserActivityTypes</key>
<array>
<string>GetShortcutIntent</string>
Expand Down
6 changes: 0 additions & 6 deletions Jellycuts/Resources/Preview Assets.xcassets/Contents.json
View file
Open in desktop

This file was deleted.

16 changes: 2 additions & 14 deletions Jellycuts/Views/Tools/Documentation/DocumentationActionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,9 @@ struct DocumentationActionView: View {
var action: DocumentationActionEntry
var currentVersion: ShortcutsHostVersion {
#if os(macOS)
if #available(macOS 11, *) {
return .macOS12//"1125.1"
}
return .macOS12//"1125.1"
#endif
if #available(iOS 16, *) {
return .iOS16
} else if #available(iOS 15, *) {
return .iOS15
} else if #available(iOS 14, *) {
return .iOS14//"1092.6"
} else if #available(iOS 13, *) {
return .iOS13// "1050.24"
} else {
return .iOS13
}
return .iOS16
}


Expand Down
2 changes: 1 addition & 1 deletion Packages/Open-Jellycore
Open in desktop
Submodule Open-Jellycore updated from 83bff5 to 1ba007
2 changes: 1 addition & 1 deletion Packages/Runestone
Open in desktop
Submodule Runestone updated 2 files
+2 −2 Package.resolved
+2 −2 Package.swift