move back to cocoapods-keys

Podfile

@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
-platform :osx, '10.14'
+platform :osx, '10.15'
   use_frameworks!
   inhibit_all_warnings!
 
@@ -30,4 +30,12 @@ platform :osx, '10.14'
     end
   end
 
+  plugin 'cocoapods-keys', {
+  	:project => "splitter_pods",
+  	:keys => [
+  		"SPLIT_SIO_SECRET",
+  		"SPLIT_SIO_CLIENT"
+  	]
+  }
+
 end

Podfile.lock

@@ -1,12 +1,14 @@
 PODS:
   - JJLISO8601DateFormatter (0.1.5)
+  - Keys (1.0.1)
   - MASShortcut (2.4.0)
   - ZippyJSON (1.2.10):
     - JJLISO8601DateFormatter (= 0.1.5)
     - ZippyJSONCFamily (= 1.2.9)
   - ZippyJSONCFamily (1.2.9)
 
 DEPENDENCIES:
+  - Keys (from `Pods/CocoaPodsKeys`)
   - MASShortcut
   - ZippyJSON
 
@@ -17,12 +19,17 @@ SPEC REPOS:
     - ZippyJSON
     - ZippyJSONCFamily
 
+EXTERNAL SOURCES:
+  Keys:
+    :path: Pods/CocoaPodsKeys
+
 SPEC CHECKSUMS:
   JJLISO8601DateFormatter: 36bc0fc8fbd77440fe8b33e0281a4c57170781e4
+  Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
   MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
   ZippyJSON: 565d1cbf09c1fac147ae6323356b04caaf9e1397
   ZippyJSONCFamily: a6fdeeb750d4891d68b8324dd90d87111f314388
 
-PODFILE CHECKSUM: bb3dabd51f31e193b13c4e173c0d7a071202ddfd
+PODFILE CHECKSUM: 3c11cb38b1a54edac2985aaaa16d5a4793454bf8
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2

README.md

@@ -44,10 +44,9 @@ If you want to build Splitter yourself:
 - Install CocoaPods if you don't already have it installed
 - Clone this repo
 - run `pod install` in the project's root directory
+	- You'll be prompted to set the secret and client keys for Splits.io, but you can press the Return key to leave them blank. See [cocoapods-keys](https://github.com/orta/cocoapods-keys?tab=readme-ov-file) for more info.
 - Open Splitter.xcworkspace in Xcode
 
-In order for certain features to work - namely Splits.io authentications, and beta updates via Sparkle - you'll need to replace the keys in `Config.xcconfig` with your own personal keys - see that file for more info.
-
 
 ### Acknowledgements
 [LiveSplit Core](https://github.com/LiveSplit/livesplit-core)

Splitter.xcodeproj/project.pbxproj

@@ -148,7 +148,6 @@
 		4AE5B0EE2A1C2080003F1288 /* BasicUpdater in Frameworks */ = {isa = PBXBuildFile; productRef = 4AE5B0ED2A1C2080003F1288 /* BasicUpdater */; };
 		4AE662DC2B4E086300D0F968 /* FontPopUp in Frameworks */ = {isa = PBXBuildFile; productRef = 4AE662DB2B4E086300D0F968 /* FontPopUp */; };
 		4AE7437E268CF2AC003629B4 /* SplitterColorWell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE7437D268CF2AC003629B4 /* SplitterColorWell.swift */; };
-		4AE7E2B02845B91500716CF3 /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 4AE7E2AF2845B88E00716CF3 /* Config.xcconfig */; };
 		4AE82354290B434000D8100B /* LayoutEditorListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4AE82353290B434000D8100B /* LayoutEditorListCell.xib */; };
 		4AE82356290B435000D8100B /* LayoutEditorListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE82355290B435000D8100B /* LayoutEditorListCell.swift */; };
 		4AE82A1624BFD4400044B6D3 /* WelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AE82A1524BFD4400044B6D3 /* WelcomeView.swift */; };
@@ -350,7 +349,6 @@
 		4AE168A526091CA900A6169B /* LayoutEditorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutEditorViewController.swift; sourceTree = "<group>"; };
 		4AE2CF3A2631F43100CC6CF7 /* SplitsComponent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitsComponent.swift; sourceTree = "<group>"; };
 		4AE7437D268CF2AC003629B4 /* SplitterColorWell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitterColorWell.swift; sourceTree = "<group>"; };
-		4AE7E2AF2845B88E00716CF3 /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
 		4AE82353290B434000D8100B /* LayoutEditorListCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LayoutEditorListCell.xib; sourceTree = "<group>"; };
 		4AE82355290B435000D8100B /* LayoutEditorListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutEditorListCell.swift; sourceTree = "<group>"; };
 		4AE82A1524BFD4400044B6D3 /* WelcomeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WelcomeView.swift; sourceTree = "<group>"; };
@@ -564,7 +562,6 @@
 			children = (
 				4A69E2C4295E10F3001FDA79 /* Programming-Notes.md */,
 				4AD7C6BB29149382006645A6 /* LiveSplitKit.xcodeproj */,
-				4AE7E2AF2845B88E00716CF3 /* Config.xcconfig */,
 				4A214A64255C8FB30006FD9F /* SplitsIOKit */,
 				4A230E9123B00A1D00959C57 /* Splitter */,
 				4A71054A24BE267300FA9127 /* SplitterTests */,
@@ -959,11 +956,9 @@
 			buildConfigurationList = 4A230EA123B00A1E00959C57 /* Build configuration list for PBXNativeTarget "Splitter" */;
 			buildPhases = (
 				3F959CA5F8D8667C869A9E69 /* [CP] Check Pods Manifest.lock */,
-				4A66573423E3E0CE00D14A67 /* Run Script */,
 				4A230E8B23B00A1D00959C57 /* Sources */,
 				4A230E8C23B00A1D00959C57 /* Frameworks */,
 				4A230E8D23B00A1D00959C57 /* Resources */,
-				4A66573523E3E0D900D14A67 /* ShellScript */,
 				0B8E043ACE44C9951BB8C2E3 /* [CP] Embed Pods Frameworks */,
 				4AD7C6CD291494ED006645A6 /* Embed Frameworks */,
 			);
@@ -1132,7 +1127,6 @@
 				4AE82354290B434000D8100B /* LayoutEditorListCell.xib in Resources */,
 				4AC0E3A62767B3F3004D71D6 /* GeneralPrefsViewController.xib in Resources */,
 				4A0981A724E34DE400E44792 /* AccountButtonView.xib in Resources */,
-				4AE7E2B02845B91500716CF3 /* Config.xcconfig in Resources */,
 				4A05EEFD24D762E200873D07 /* DownloadWindow.storyboard in Resources */,
 				4A230E9C23B00A1E00959C57 /* Main.storyboard in Resources */,
 				4A56138A262CFB8900702B0E /* OptionsRow.xib in Resources */,
@@ -1201,41 +1195,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		4A66573423E3E0CE00D14A67 /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#if [ $CONFIGURATION == Release ]; then\n   # echo \"Bumping build number...\"\n#    plist=${PROJECT_DIR}/${INFOPLIST_FILE}\n\n# increment the build number (ie 115 to 116)\n #   buildnum=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"${plist}\")\n  #  if [[ \"${buildnum}\" == \"\" ]]; then\n   #     echo \"No build number in $plist\"\n    #    exit 2\n    #fi\n\n    #buildnum=$(expr $buildnum + 1)\n    #/usr/libexec/Plistbuddy -c \"Set CFBundleVersion $buildnum\" \"${plist}\"\n    #echo \"Bumped build number to $buildnum\"\n\n#else\n #   echo $CONFIGURATION \" build - Not bumping build number.\"\n#fi\n";
-		};
-		4A66573523E3E0D900D14A67 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#if [ $CONFIGURATION == Release ]; then\n#    echo \"Bumping build number...\"\n#    plist=${PROJECT_DIR}/${INFOPLIST_FILE}\n\n# increment the build number (ie 115 to 116)\n #   buildnum=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"${plist}\")\n  #  if [[ \"${buildnum}\" == \"\" ]]; then\n   #     echo \"No build number in $plist\"\n    #    exit 2\n    #fi\n\n    #buildnum=$(expr $buildnum + 1)\n    #/usr/libexec/Plistbuddy -c \"Set CFBundleVersion $buildnum\" \"${plist}\"\n    #echo \"Bumped build number to $buildnum\"\n\n#else\n #   echo $CONFIGURATION \" build - Not bumping build number.\"\n#fi\n";
-		};
 		5C74E688F4239AE0D1302A28 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1474,7 +1433,6 @@
 /* Begin XCBuildConfiguration section */
 		4A230E9F23B00A1E00959C57 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4AE7E2AF2845B88E00716CF3 /* Config.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -1636,7 +1594,6 @@
 		};
 		4A230EA323B00A1E00959C57 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4AE7E2AF2845B88E00716CF3 /* Config.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";

Splitter/AppDelegate.swift

@@ -12,6 +12,7 @@ import Files
 import SwiftUI
 import SplitsIOKit
 import BasicUpdater
+import Keys
 
 extension NSApplication {
 	static let appDelegate = NSApp.delegate as! AppDelegate
@@ -29,25 +30,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 	let updateController = UpdateController.shared
 
-	static func getFromInfo(key: String) -> String? {
-		return Bundle.main.object(forInfoDictionaryKey: key) as? String
-	}
-
 	static var splitsioclient: String {
 		#if DEBUG
 		if let clientOverride = Settings.splitsIOClientOverride {
 			return clientOverride
 		}
 		#endif
-		return getFromInfo(key: "splitsioclient")!
+		return SplitterKeys().sPLIT_SIO_CLIENT
 	}
 	static var splitsiosecret: String {
 		#if DEBUG
 		if let secretOverride = Settings.splitsIOSecretOverride {
 			return secretOverride
 		}
 		#endif
-		return getFromInfo(key: "splitsiosecret")!
+		return SplitterKeys().sPLIT_SIO_SECRET
 	}
 
 	static var splitsIOAuth = SplitsIOAuth(client: splitsioclient, secret: splitsiosecret, redirects: "splitter://login", url: Settings.splitsIOURL.absoluteString)