diff options
| -rw-r--r-- | Map.xcodeproj/project.pbxproj | 42 | ||||
| -rw-r--r-- | Map.xcodeproj/xcshareddata/xcschemes/Map.xcscheme | 78 | ||||
| -rw-r--r-- | Map.xcodeproj/xcshareddata/xcschemes/QuickLook.xcscheme | 101 | ||||
| -rw-r--r-- | Map/Info.plist | 14 | ||||
| -rw-r--r-- | Shared/Config.xcconfig | 5 |
5 files changed, 225 insertions, 15 deletions
diff --git a/Map.xcodeproj/project.pbxproj b/Map.xcodeproj/project.pbxproj index 1a3a167..5c97780 100644 --- a/Map.xcodeproj/project.pbxproj +++ b/Map.xcodeproj/project.pbxproj @@ -128,6 +128,20 @@ ); target = B5282B012E210D4400C62006 /* QuickLook */; }; + B564290B2E211EE400B1EE8B /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Config.xcconfig, + ); + target = B545870B2C961E9C0067B788 /* Map */; + }; + B564290C2E211EE400B1EE8B /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Config.xcconfig, + ); + target = B5282B012E210D4400C62006 /* QuickLook */; + }; B59830752E17E7C700F5FBF6 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( @@ -163,6 +177,7 @@ /* Begin PBXFileSystemSynchronizedRootGroup section */ B5282B062E210D4500C62006 /* QuickLook */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (B5282B162E210D4500C62006 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = QuickLook; sourceTree = "<group>"; }; + B56429052E211C6900B1EE8B /* Shared */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (B564290B2E211EE400B1EE8B /* PBXFileSystemSynchronizedBuildFileExceptionSet */, B564290C2E211EE400B1EE8B /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Shared; sourceTree = "<group>"; }; B598304E2E17E7C700F5FBF6 /* Map */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (B59830752E17E7C700F5FBF6 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, B5DF1E3F2E1868E8003477B5 /* PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet */, B5282B1B2E210D9F00C62006 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, B5282B492E21124E00C62006 /* PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Map; sourceTree = "<group>"; }; B59830772E17E7CC00F5FBF6 /* MapTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MapTests; sourceTree = "<group>"; }; B598307C2E17E7D600F5FBF6 /* MapUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MapUITests; sourceTree = "<group>"; }; @@ -217,6 +232,7 @@ B54587032C961E9C0067B788 = { isa = PBXGroup; children = ( + B56429052E211C6900B1EE8B /* Shared */, B598304E2E17E7C700F5FBF6 /* Map */, B59830772E17E7CC00F5FBF6 /* MapTests */, B598307C2E17E7D600F5FBF6 /* MapUITests */, @@ -255,6 +271,7 @@ ); fileSystemSynchronizedGroups = ( B5282B062E210D4500C62006 /* QuickLook */, + B56429052E211C6900B1EE8B /* Shared */, ); name = QuickLook; packageProductDependencies = ( @@ -281,6 +298,7 @@ B5282B112E210D4500C62006 /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( + B56429052E211C6900B1EE8B /* Shared */, B598304E2E17E7C700F5FBF6 /* Map */, ); name = Map; @@ -470,10 +488,12 @@ /* Begin XCBuildConfiguration section */ B5282B142E210D4500C62006 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReferenceAnchor = B56429052E211C6900B1EE8B /* Shared */; + baseConfigurationReferenceRelativePath = Config.xcconfig; buildSettings = { CODE_SIGN_ENTITLEMENTS = QuickLook/QuickLook.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)"; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QuickLook/Info.plist; @@ -485,7 +505,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.5; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map.QuickLook; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -496,10 +516,12 @@ }; B5282B152E210D4500C62006 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReferenceAnchor = B56429052E211C6900B1EE8B /* Shared */; + baseConfigurationReferenceRelativePath = Config.xcconfig; buildSettings = { CODE_SIGN_ENTITLEMENTS = QuickLook/QuickLook.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)"; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QuickLook/Info.plist; @@ -511,7 +533,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 15.5; - MARKETING_VERSION = 1.0; + MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map.QuickLook; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -646,13 +668,15 @@ }; B54587352C961E9E0067B788 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReferenceAnchor = B56429052E211C6900B1EE8B /* Shared */; + baseConfigurationReferenceRelativePath = Config.xcconfig; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 50; + CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)"; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\""; ENABLE_HARDENED_RUNTIME = YES; @@ -666,7 +690,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -677,13 +701,15 @@ }; B54587362C961E9E0067B788 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReferenceAnchor = B56429052E211C6900B1EE8B /* Shared */; + baseConfigurationReferenceRelativePath = Config.xcconfig; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Map/Map.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 50; + CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)"; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"Map/Preview Content\""; ENABLE_HARDENED_RUNTIME = YES; @@ -697,7 +723,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.0; - MARKETING_VERSION = 4.0.0; + MARKETING_VERSION = "$(MARKETING_VERSION)"; PRODUCT_BUNDLE_IDENTIFIER = systems.tranquil.Map; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/Map.xcodeproj/xcshareddata/xcschemes/Map.xcscheme b/Map.xcodeproj/xcshareddata/xcschemes/Map.xcscheme new file mode 100644 index 0000000..dba25dc --- /dev/null +++ b/Map.xcodeproj/xcshareddata/xcschemes/Map.xcscheme @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "1640" + version = "1.7"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B545870B2C961E9C0067B788" + BuildableName = "Map.app" + BlueprintName = "Map" + ReferencedContainer = "container:Map.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES" + shouldAutocreateTestPlan = "YES"> + </TestAction> + <LaunchAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B545870B2C961E9C0067B788" + BuildableName = "Map.app" + BlueprintName = "Map" + ReferencedContainer = "container:Map.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </LaunchAction> + <ProfileAction + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B545870B2C961E9C0067B788" + BuildableName = "Map.app" + BlueprintName = "Map" + ReferencedContainer = "container:Map.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/Map.xcodeproj/xcshareddata/xcschemes/QuickLook.xcscheme b/Map.xcodeproj/xcshareddata/xcschemes/QuickLook.xcscheme new file mode 100644 index 0000000..900c4d5 --- /dev/null +++ b/Map.xcodeproj/xcshareddata/xcschemes/QuickLook.xcscheme @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "1640" + wasCreatedForAppExtension = "YES" + version = "2.0"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B5282B012E210D4400C62006" + BuildableName = "QuickLook.appex" + BlueprintName = "QuickLook" + ReferencedContainer = "container:Map.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B545870B2C961E9C0067B788" + BuildableName = "Map.app" + BlueprintName = "Map" + ReferencedContainer = "container:Map.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES" + shouldAutocreateTestPlan = "YES"> + </TestAction> + <LaunchAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "" + selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn" + launchStyle = "0" + askForAppToLaunch = "Yes" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES" + launchAutomaticallySubstyle = "2"> + <RemoteRunnable + runnableDebuggingMode = "0" + BundleIdentifier = "systems.tranquil.Map" + RemotePath = "/Applications/Map.app"> + </RemoteRunnable> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B545870B2C961E9C0067B788" + BuildableName = "Map.app" + BlueprintName = "Map" + ReferencedContainer = "container:Map.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </LaunchAction> + <ProfileAction + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES" + askForAppToLaunch = "Yes" + launchAutomaticallySubstyle = "2"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "B545870B2C961E9C0067B788" + BuildableName = "Map.app" + BlueprintName = "Map" + ReferencedContainer = "container:Map.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/Map/Info.plist b/Map/Info.plist index fb1a6fc..3ce52cd 100644 --- a/Map/Info.plist +++ b/Map/Info.plist @@ -4,12 +4,6 @@ <dict> <key>ATSApplicationFontsPath</key> <string>Fonts</string> - <key>SUEnableInstallerLauncherService</key> - <true/> - <key>SUPublicEDKey</key> - <string>lacD9VFVjJO55y+hEy+ReU4S0xbrnbdhncui1qLsmfI=</string> - <key>SUFeedURL</key> - <string>https://map.tranquil.systems/appcast.xml</string> <key>CFBundleDocumentTypes</key> <array> <dict> @@ -25,6 +19,12 @@ <string>$(PRODUCT_BUNDLE_IDENTIFIER).exampledocument</string> </dict> </array> + <key>SUEnableInstallerLauncherService</key> + <true/> + <key>SUFeedURL</key> + <string>https://map.tranquil.systems/appcast.xml</string> + <key>SUPublicEDKey</key> + <string>lacD9VFVjJO55y+hEy+ReU4S0xbrnbdhncui1qLsmfI=</string> <key>UTImportedTypeDeclarations</key> <array> <dict> @@ -33,7 +33,7 @@ <string>public.plain-text</string> </array> <key>UTTypeDescription</key> - <string>Wardley Map written in Map's wmap syntax</string> + <string>Wardley Map written in Map's wmap syntax</string> <key>UTTypeIcons</key> <dict/> <key>UTTypeIdentifier</key> diff --git a/Shared/Config.xcconfig b/Shared/Config.xcconfig new file mode 100644 index 0000000..732bbea --- /dev/null +++ b/Shared/Config.xcconfig @@ -0,0 +1,5 @@ +// Marketing version (user-facing version number) +MARKETING_VERSION = 4.1.0 + +// Build number (internal version number) +CURRENT_PROJECT_VERSION = 60 |