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

Mac Catalyst compatibility implemented #98

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Mac Catalyst compatibility implemented #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f93d168
Mac Catalyst compatibility implemented
pableiros May 26, 2022
26c8982
Code formatted
pableiros May 26, 2022
323a9d8
mac catalyst compatibility improved
pableiros Aug 9, 2022
1b73d9b
Merge pull request #1 from pableiros/feature/maccatalyst
pableiros Aug 9, 2022
1d73b4e
Code formatted to original style
pableiros Aug 9, 2022
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
6 changes: 6 additions & 0 deletions Example/Example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
DE524D6E1EC47CB100E8C2F9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
DE524D701EC47CB100E8C2F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EAEB7F4358B9EF21E9D96277 /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F8CC7E0728A3236D0031C8A7 /* Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Example.entitlements; sourceTree = "<group>"; };
FCB2E9461ECA8B7600285B87 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
FCB2E9481ECA929500285B87 /* Storyboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Storyboard.swift; sourceTree = "<group>"; };
FCB2E94A1ECA93CB00285B87 /* ScrollView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -120,6 +121,7 @@
DE524D631EC47CB100E8C2F9 /* Example */ = {
isa = PBXGroup;
children = (
F8CC7E0728A3236D0031C8A7 /* Example.entitlements */,
3E3DF022278C5375009DD55A /* SwiftUI */,
3E5E1E1F26E8F1670098F0E3 /* ViewController */,
FCB2E9501ECAF36500285B87 /* sample.md */,
Expand Down Expand Up @@ -406,6 +408,7 @@
baseConfigurationReference = 88E6DEC525FE3CD3BAB79EA8 /* Pods-Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = XF6BW7ZJN2;
Expand All @@ -414,6 +417,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.keita.oouchi.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTS_MACCATALYST = YES;
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand All @@ -423,6 +427,7 @@
baseConfigurationReference = 7DB4CCAB27BE7F6CF35BA1E5 /* Pods-Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = XF6BW7ZJN2;
Expand All @@ -431,6 +436,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.keita.oouchi.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTS_MACCATALYST = YES;
SWIFT_VERSION = 5.0;
};
name = Release;
Expand Down
10 changes: 10 additions & 0 deletions Example/Example/Example.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.network.client</key>
<true/>
</dict>
</plist>
9 changes: 1 addition & 8 deletions MarkdownView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@ Pod::Spec.new do |s|
"Sources/MarkdownView/MarkdownView.swift",
"Sources/MarkdownView/MarkdownUI.swift",
]
s.resource_bundles = {
'MarkdownView' => [
'Sources/MarkdownView/Resources/styled.html',
'Sources/MarkdownView/Resources/non_styled.html',
'Sources/MarkdownView/Resources/main.css',
'Sources/MarkdownView/Resources/main.js'
]
}
s.resources = "**/styled.html", "**/non_styled.html", "**/main.css", "**/main.js"
s.frameworks = "Foundation"
s.ios.deployment_target = "13.0"
s.swift_version = '5.2'
Expand Down