remove CairoSVG, fixed Metadata

brightdigit · Dec 15, 2020 · b02d446 · b02d446
1 parent f949e11
commit b02d446
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 32 deletions.
diff --git a/Speculid.xcodeproj/project.pbxproj b/Speculid.xcodeproj/project.pbxproj
@@ -8,8 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		B303554A24381F1200A8EAB9 /* SpeculidKit in Frameworks */ = {isa = PBXBuildFile; productRef = B303554924381F1200A8EAB9 /* SpeculidKit */; };
-		B324D41424C49F500047ED11 /* CairoSVG.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B324D41324C49F500047ED11 /* CairoSVG.xcframework */; };
-		B324D41524C49F500047ED11 /* CairoSVG.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B324D41324C49F500047ED11 /* CairoSVG.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B3326D4324C1CFF000629F70 /* Tooltip.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3326D4224C1CFF000629F70 /* Tooltip.swift */; };
 		B347128924B64968001CCCFD /* ClassicDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = B347128824B64968001CCCFD /* ClassicDocument.swift */; };
 		B347128B24B668DE001CCCFD /* ClassicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B347128A24B668DE001CCCFD /* ClassicView.swift */; };
@@ -24,21 +22,10 @@
 		B3E741E82530AF2500002110 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3E741E72530AF2500002110 /* main.swift */; };
 		B3E741EE2530AF5A00002110 /* SpeculidKit in Frameworks */ = {isa = PBXBuildFile; productRef = B3E741ED2530AF5A00002110 /* SpeculidKit */; };
 		B3E741F22530AFD500002110 /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = B3E741F12530AFD500002110 /* ArgumentParser */; };
-		B3E7420F2530B78F00002110 /* speculid in CopyFiles */ = {isa = PBXBuildFile; fileRef = B3E741E52530AF2500002110 /* speculid */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		B3E7420F2530B78F00002110 /* speculid in CopyFiles */ = {isa = PBXBuildFile; fileRef = B3E741E52530AF2500002110 /* speculid */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		B324D41624C49F500047ED11 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				B324D41524C49F500047ED11 /* CairoSVG.xcframework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		B3796B7A2432C33600E5F5F9 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 12;
@@ -83,7 +70,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				B303554A24381F1200A8EAB9 /* SpeculidKit in Frameworks */,
-				B324D41424C49F500047ED11 /* CairoSVG.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -195,7 +181,6 @@
 				B3DB48042431642100B1DA4F /* Frameworks */,
 				B3DB48052431642100B1DA4F /* Resources */,
 				B3796B7A2432C33600E5F5F9 /* CopyFiles */,
-				B324D41624C49F500047ED11 /* Embed Frameworks */,
 				B33E6494252F612700A12CFD /* ShellScript */,
 			);
 			buildRules = (
@@ -298,7 +283,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# swiftformat --lint . && swiftlint\n";
+			shellScript = "codesign --force --verbose  --entitlements \"${SRCROOT}/command/Command.entitlements\" -s \"${CODE_SIGN_IDENTITY}\" \"${TARGET_BUILD_DIR}/Speculid.app/Contents/SharedSupport/speculid\"   \n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -446,7 +431,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 18;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_ASSET_PATHS = "\"Speculid/Preview Content\"";
 				DEVELOPMENT_TEAM = MLT7M394S7;
@@ -504,7 +489,6 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = x86_64;
 			};
 			name = Debug;
 		};
@@ -546,7 +530,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 18;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "\"Speculid/Preview Content\"";
 				DEVELOPMENT_TEAM = MLT7M394S7;
@@ -597,7 +581,6 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = x86_64;
 			};
 			name = Release;
 		};
@@ -615,9 +598,9 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = speculid/speculid.entitlements;
+				CODE_SIGN_ENTITLEMENTS = command/Command.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = MLT7M394S7;
@@ -636,6 +619,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -658,9 +642,9 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = speculid/speculid.entitlements;
+				CODE_SIGN_ENTITLEMENTS = command/Command.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = MLT7M394S7;
@@ -674,6 +658,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;

diff --git a/Speculid/Info.plist b/Speculid/Info.plist
@@ -7,6 +7,8 @@
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Speculid Project Document</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSHandlerRank</key>
@@ -19,6 +21,8 @@
 			<string>$(PRODUCT_BUNDLE_IDENTIFIER).speculid-project-document</string>
 		</dict>
 		<dict>
+			<key>CFBundleTypeName</key>
+			<string>Speculid Image Document</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSHandlerRank</key>
@@ -61,6 +65,8 @@
 	<true/>
 	<key>NSSupportsSuddenTermination</key>
 	<true/>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>UTImportedTypeDeclarations</key>
 	<array>
 		<dict>

diff --git a/Speculid/Speculid.entitlements b/Speculid/Speculid.entitlements
@@ -2,11 +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>$(TeamIdentifierPrefix)group.com.brightdigit.Speculid</string>
 	</array>
-	<key>com.apple.security.cs.disable-library-validation</key>
+	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
 </dict>
 </plist>
diff --git a/Speculid/SpeculidApp.swift b/Speculid/SpeculidApp.swift
@@ -9,11 +9,6 @@ struct SpeculidApp: App {
     DocumentGroup(newDocument: ClassicDocument()) { file in
       ClassicView(url: file.fileURL, document: file.document, documentBinding: file.$document).environmentObject(bookmarkCollection)
     }
-
-//    DocumentGroup(viewing: ClassicDocument.self) { file in
-//
-//      ClassicView(url: file.fileURL, document: file.document, documentBinding: file.$document).environmentObject(bookmarkCollection)
-//    }
     .commands {
       CommandMenu("Developer Tools") {
         Button("Reset Bookmarks") {

diff --git a/packages/SpeculidKit b/packages/SpeculidKit
+1 −2		Package.swift
+1 −2		Sources/SpeculidKit/Controllers/ServiceObject.swift
+0 −1		Sources/SpeculidKit/Controllers/SpeculidImageSpecificationBuilder.swift
+2 −1		Sources/SpeculidKit/Extensions/GeometryDimension.Codable.swift
+0 −1		Sources/SpeculidKit/Extensions/NSColor.swift
+0 −1		Sources/SpeculidKit/Models/ImageFile.swift
+0 −1		Sources/SpeculidKit/Models/ImageSpecificationObject.swift
+1 −2		Sources/SpeculidKit/Models/SpeculidSpecificationsFile.swift
+23 −0		Sources/SpeculidKit/Protocols/CairoColorProtocol.swift
+26 −0		Sources/SpeculidKit/Protocols/Dimension.swift
+24 −0		Sources/SpeculidKit/Protocols/GeometryDimension.swift
+24 −0		Sources/SpeculidKit/Protocols/ImageFileFormat.swift
+24 −0		Sources/SpeculidKit/Protocols/ImageFileProtocol.swift
+27 −0		Sources/SpeculidKit/Protocols/ImageSpecificationProtocol.swift
+0 −1		_archive/frameworks/speculid/Controllers/CairoConversionSet.swift
+0 −1		_archive/frameworks/speculid/Controllers/CairoConversionSetBuilder.swift