diff --git a/Podfile b/Podfile deleted file mode 100755 index f4b8056..0000000 --- a/Podfile +++ /dev/null @@ -1,13 +0,0 @@ -platform :macos, '10.11' - -target 'Predator' do - use_frameworks! - - pod 'Sparkle' -end - -target 'PredatorSandbox' do - use_frameworks! - - pod 'Sparkle' -end diff --git a/Podfile.lock b/Podfile.lock deleted file mode 100644 index 49ebcce..0000000 --- a/Podfile.lock +++ /dev/null @@ -1,16 +0,0 @@ -PODS: - - Sparkle (1.21.3) - -DEPENDENCIES: - - Sparkle - -SPEC REPOS: - https://github.com/cocoapods/specs.git: - - Sparkle - -SPEC CHECKSUMS: - Sparkle: 3f75576db8b0265adef36c43249d747f22d0b708 - -PODFILE CHECKSUM: 0d6b79d3c693ee9f006d318c6c6663cedfd38397 - -COCOAPODS: 1.6.1 diff --git a/Predator.xcodeproj/project.pbxproj b/Predator.xcodeproj/project.pbxproj index 889e706..8b88594 100644 --- a/Predator.xcodeproj/project.pbxproj +++ b/Predator.xcodeproj/project.pbxproj @@ -23,8 +23,6 @@ 35C1533022821C94005B24A9 /* PredatorCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 35C1532E22821C94005B24A9 /* PredatorCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; 35C1533322821C94005B24A9 /* PredatorCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C1532C22821C94005B24A9 /* PredatorCore.framework */; }; 35C1533422821C94005B24A9 /* PredatorCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 35C1532C22821C94005B24A9 /* PredatorCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 8BF4591B5BC37824A7CB71AD /* Pods_Predator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AFB711BA0578401F50F95FBF /* Pods_Predator.framework */; }; - 8F66C694464AD1249ECD8F5B /* Pods_PredatorSandbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9B29F7AB9F2476E87362CEB /* Pods_PredatorSandbox.framework */; }; 9828FEB62294142A00E1754D /* PredatorCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35C1532C22821C94005B24A9 /* PredatorCore.framework */; }; 9828FEB8229414A400E1754D /* PredatorCore.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 35C1532C22821C94005B24A9 /* PredatorCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 9828FEBA2294267200E1754D /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9828FEB92294267200E1754D /* Configuration.swift */; }; @@ -65,8 +63,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2B32A618721DC1F9A5D6760E /* Pods-Predator.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Predator.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Predator/Pods-Predator.debug.xcconfig"; sourceTree = ""; }; - 2F8805DA973547418F4B0B8B /* Pods-PredatorSandbox.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PredatorSandbox.release.xcconfig"; path = "Pods/Target Support Files/Pods-PredatorSandbox/Pods-PredatorSandbox.release.xcconfig"; sourceTree = ""; }; 356E4FB322835C63002FF647 /* PredatorClock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PredatorClock.swift; sourceTree = ""; }; 35854B5B228746BC00356369 /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = ""; }; 35854B5E2287512300356369 /* PredatorPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PredatorPreviewView.swift; sourceTree = ""; }; @@ -88,10 +84,8 @@ 35C1532C22821C94005B24A9 /* PredatorCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PredatorCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 35C1532E22821C94005B24A9 /* PredatorCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PredatorCore.h; sourceTree = ""; }; 35C1532F22821C94005B24A9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 784233476E764D5CB66872DA /* Pods-PredatorSandbox.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PredatorSandbox.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PredatorSandbox/Pods-PredatorSandbox.debug.xcconfig"; sourceTree = ""; }; 9828FEB92294267200E1754D /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = ""; }; AFB711BA0578401F50F95FBF /* Pods_Predator.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Predator.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - B5879D787E4B70C80B50AE13 /* Pods-Predator.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Predator.release.xcconfig"; path = "Pods/Target Support Files/Pods-Predator/Pods-Predator.release.xcconfig"; sourceTree = ""; }; F9B29F7AB9F2476E87362CEB /* Pods_PredatorSandbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PredatorSandbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -101,7 +95,6 @@ buildActionMask = 2147483647; files = ( 9828FEB62294142A00E1754D /* PredatorCore.framework in Frameworks */, - 8BF4591B5BC37824A7CB71AD /* Pods_Predator.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -110,7 +103,6 @@ buildActionMask = 2147483647; files = ( 35C1533322821C94005B24A9 /* PredatorCore.framework in Frameworks */, - 8F66C694464AD1249ECD8F5B /* Pods_PredatorSandbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -124,17 +116,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 06BB4D03EE79D3DEA050E7CB /* Pods */ = { - isa = PBXGroup; - children = ( - 2B32A618721DC1F9A5D6760E /* Pods-Predator.debug.xcconfig */, - B5879D787E4B70C80B50AE13 /* Pods-Predator.release.xcconfig */, - 784233476E764D5CB66872DA /* Pods-PredatorSandbox.debug.xcconfig */, - 2F8805DA973547418F4B0B8B /* Pods-PredatorSandbox.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; 35810FBE2284B0F0005852DE /* Frameworks */ = { isa = PBXGroup; children = ( @@ -162,7 +143,6 @@ 35C1532D22821C94005B24A9 /* PredatorCore */, 35C1530522820A34005B24A9 /* Products */, 35810FBE2284B0F0005852DE /* Frameworks */, - 06BB4D03EE79D3DEA050E7CB /* Pods */, ); sourceTree = ""; }; @@ -263,12 +243,10 @@ isa = PBXNativeTarget; buildConfigurationList = 35C1530E22820A34005B24A9 /* Build configuration list for PBXNativeTarget "Predator" */; buildPhases = ( - BA84A12C32FFCB76AD9F4C62 /* [CP] Check Pods Manifest.lock */, 35C152FF22820A34005B24A9 /* Headers */, 35C1530022820A34005B24A9 /* Sources */, 35C1530122820A34005B24A9 /* Frameworks */, 35C1530222820A34005B24A9 /* Resources */, - 9828FEB52294101300E1754D /* [CP] Embed Pods Frameworks */, 9828FEB72294149500E1754D /* CopyFiles */, ); buildRules = ( @@ -280,23 +258,21 @@ productReference = 35C1530422820A34005B24A9 /* Predator.saver */; productType = "com.apple.product-type.bundle"; }; - 35C15316228219EB005B24A9 /* PredatorSandbox */ = { + 35C15316228219EB005B24A9 /* PredatorApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 35C15322228219ED005B24A9 /* Build configuration list for PBXNativeTarget "PredatorSandbox" */; + buildConfigurationList = 35C15322228219ED005B24A9 /* Build configuration list for PBXNativeTarget "PredatorApp" */; buildPhases = ( - 6EE7CB5DB64C20B525C2AF40 /* [CP] Check Pods Manifest.lock */, 35C15313228219EB005B24A9 /* Sources */, 35C15314228219EB005B24A9 /* Frameworks */, 35C15315228219EB005B24A9 /* Resources */, 35C1533822821C94005B24A9 /* Embed Frameworks */, - 3AE15486BF48A0547B2E0D12 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( 35C1533222821C94005B24A9 /* PBXTargetDependency */, ); - name = PredatorSandbox; + name = PredatorApp; productName = PredatorClockSandbox; productReference = 35C15317228219EB005B24A9 /* Predator.app */; productType = "com.apple.product-type.application"; @@ -356,7 +332,7 @@ projectRoot = ""; targets = ( 35C1530322820A34005B24A9 /* Predator */, - 35C15316228219EB005B24A9 /* PredatorSandbox */, + 35C15316228219EB005B24A9 /* PredatorApp */, 35C1532B22821C94005B24A9 /* PredatorCore */, ); }; @@ -392,100 +368,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 3AE15486BF48A0547B2E0D12 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PredatorSandbox/Pods-PredatorSandbox-frameworks.sh", - "${PODS_ROOT}/Sparkle/Sparkle.framework", - "${PODS_ROOT}/Sparkle/Sparkle.framework.dSYM", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework", - "${DWARF_DSYM_FOLDER_PATH}/Sparkle.framework.dSYM", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PredatorSandbox/Pods-PredatorSandbox-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 6EE7CB5DB64C20B525C2AF40 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PredatorSandbox-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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; - }; - 9828FEB52294101300E1754D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Predator/Pods-Predator-frameworks.sh", - "${PODS_ROOT}/Sparkle/Sparkle.framework", - "${PODS_ROOT}/Sparkle/Sparkle.framework.dSYM", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework", - "${DWARF_DSYM_FOLDER_PATH}/Sparkle.framework.dSYM", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${SRCROOT}/Pods/Target Support Files/Pods-Predator/Pods-Predator-frameworks.sh\"\n"; - }; - BA84A12C32FFCB76AD9F4C62 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Predator-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 35C1530022820A34005B24A9 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -651,7 +533,6 @@ }; 35C1530F22820A34005B24A9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2B32A618721DC1F9A5D6760E /* Pods-Predator.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; @@ -660,7 +541,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 6HP739XXXJ; + DEVELOPMENT_TEAM = M5V6U6S8F7; INFOPLIST_FILE = Predator/Info.plist; INSTALL_PATH = "$(HOME)/Library/Screen Savers"; LD_RUNPATH_SEARCH_PATHS = ( @@ -668,8 +549,8 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.vpeschenkov.predator-clock"; + MACOSX_DEPLOYMENT_TARGET = 10.12; + PRODUCT_BUNDLE_IDENTIFIER = space.predatorsaver.predator; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_COMPILATION_MODE = singlefile; @@ -681,7 +562,6 @@ }; 35C1531022820A34005B24A9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B5879D787E4B70C80B50AE13 /* Pods-Predator.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; @@ -690,7 +570,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 6HP739XXXJ; + DEVELOPMENT_TEAM = M5V6U6S8F7; INFOPLIST_FILE = Predator/Info.plist; INSTALL_PATH = "$(HOME)/Library/Screen Savers"; LD_RUNPATH_SEARCH_PATHS = ( @@ -698,8 +578,8 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.vpeschenkov.predator-clock"; + MACOSX_DEPLOYMENT_TARGET = 10.12; + PRODUCT_BUNDLE_IDENTIFIER = space.predatorsaver.predator; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_COMPILATION_MODE = wholemodule; @@ -710,7 +590,6 @@ }; 35C15323228219ED005B24A9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 784233476E764D5CB66872DA /* Pods-PredatorSandbox.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -719,7 +598,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = NO; - DEVELOPMENT_TEAM = 6HP739XXXJ; + DEVELOPMENT_TEAM = M5V6U6S8F7; INFOPLIST_FILE = PredatorSandbox/Info.plist; INSTALL_PATH = "$(LOCAL_APPS_DIR)"; LD_RUNPATH_SEARCH_PATHS = ( @@ -727,7 +606,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.vpeschenkov.predator-clock-sandbox"; + PRODUCT_BUNDLE_IDENTIFIER = space.predatorsaver.predator.sandbox; PRODUCT_NAME = Predator; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -738,7 +617,6 @@ }; 35C15324228219ED005B24A9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2F8805DA973547418F4B0B8B /* Pods-PredatorSandbox.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -747,7 +625,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = NO; - DEVELOPMENT_TEAM = 6HP739XXXJ; + DEVELOPMENT_TEAM = M5V6U6S8F7; INFOPLIST_FILE = PredatorSandbox/Info.plist; INSTALL_PATH = "$(LOCAL_APPS_DIR)"; LD_RUNPATH_SEARCH_PATHS = ( @@ -755,7 +633,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.vpeschenkov.predator-clock-sandbox"; + PRODUCT_BUNDLE_IDENTIFIER = space.predatorsaver.predator.sandbox; PRODUCT_NAME = Predator; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_COMPILATION_MODE = wholemodule; @@ -775,7 +653,7 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 6HP739XXXJ; + DEVELOPMENT_TEAM = M5V6U6S8F7; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -788,7 +666,7 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.vpeschenkov.predator-clock-core"; + PRODUCT_BUNDLE_IDENTIFIER = space.predatorsaver.predator.core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -810,7 +688,7 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 6HP739XXXJ; + DEVELOPMENT_TEAM = M5V6U6S8F7; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -823,7 +701,7 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = "com.vpeschenkov.predator-clock-core"; + PRODUCT_BUNDLE_IDENTIFIER = space.predatorsaver.predator.core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; @@ -855,7 +733,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 35C15322228219ED005B24A9 /* Build configuration list for PBXNativeTarget "PredatorSandbox" */ = { + 35C15322228219ED005B24A9 /* Build configuration list for PBXNativeTarget "PredatorApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 35C15323228219ED005B24A9 /* Debug */, diff --git a/Predator.xcodeproj/xcshareddata/xcschemes/PredatorSandbox.xcscheme b/Predator.xcodeproj/xcshareddata/xcschemes/PredatorSandbox.xcscheme index 31969aa..6da743b 100644 --- a/Predator.xcodeproj/xcshareddata/xcschemes/PredatorSandbox.xcscheme +++ b/Predator.xcodeproj/xcshareddata/xcschemes/PredatorSandbox.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "35C15316228219EB005B24A9" BuildableName = "Predator.app" - BlueprintName = "PredatorSandbox" + BlueprintName = "PredatorApp" ReferencedContainer = "container:Predator.xcodeproj"> @@ -34,7 +34,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "35C15316228219EB005B24A9" BuildableName = "Predator.app" - BlueprintName = "PredatorSandbox" + BlueprintName = "PredatorApp" ReferencedContainer = "container:Predator.xcodeproj"> @@ -57,7 +57,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "35C15316228219EB005B24A9" BuildableName = "Predator.app" - BlueprintName = "PredatorSandbox" + BlueprintName = "PredatorApp" ReferencedContainer = "container:Predator.xcodeproj"> @@ -76,7 +76,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "35C15316228219EB005B24A9" BuildableName = "Predator.app" - BlueprintName = "PredatorSandbox" + BlueprintName = "PredatorApp" ReferencedContainer = "container:Predator.xcodeproj"> diff --git a/Predator.xcworkspace/contents.xcworkspacedata b/Predator.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index ab3b54b..0000000 --- a/Predator.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/Predator.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Predator.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/Predator.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Predator/Info.plist b/Predator/Info.plist index c110436..3ce5fc7 100644 --- a/Predator/Info.plist +++ b/Predator/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.0.5 + 1.0.6 CFBundleVersion - 12 + 13 NSHumanReadableCopyright Copyright © 2019 Victor Peschenkov. All rights reserved. NSPrincipalClass diff --git a/Predator/PredatorView.swift b/Predator/PredatorView.swift index f4beb47..674e943 100644 --- a/Predator/PredatorView.swift +++ b/Predator/PredatorView.swift @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import Sparkle import ScreenSaver import PredatorCore @@ -43,16 +42,6 @@ final class PredatorView: ScreenSaverView { private func configure() { animationTimeInterval = Preferences.animationTimeInterval startAnimation() - - if Preferences.shared.autoUpdates { - if let updater = SUUpdater(for: Bundle(for: PredatorView.self)) { - // 1 day - if updater.lastUpdateCheckDate.timeIntervalSinceNow.distance(to: -86400) > 0 { - updater.resetUpdateCycle() - updater.installUpdatesIfAvailable() - } - } - } } } diff --git a/Predator/Preferences/Preferences.swift b/Predator/Preferences/Preferences.swift index 427129f..b4df614 100644 --- a/Predator/Preferences/Preferences.swift +++ b/Predator/Preferences/Preferences.swift @@ -64,17 +64,6 @@ final class Preferences: Configuration { } } - public var autoUpdates: Bool { - set { - defaults.set(newValue, forKey: Key.autoInstallUpdates) - defaults.synchronize() - } - - get { - return defaults.bool(forKey: Key.autoInstallUpdates) - } - } - public var drawEmptyDigits: Bool { set { defaults.set(newValue, forKey: Key.drawEmptyDigits) diff --git a/Predator/Preferences/PreferencesWindowController.swift b/Predator/Preferences/PreferencesWindowController.swift index cff6cf9..726b18f 100644 --- a/Predator/Preferences/PreferencesWindowController.swift +++ b/Predator/Preferences/PreferencesWindowController.swift @@ -13,14 +13,12 @@ // limitations under the License. import Cocoa -import Sparkle final class PreferencesWindowController: NSWindowController { @IBOutlet var colorPicker: NSColorWell! @IBOutlet var previewView: NSView! @IBOutlet var reverseCheckbox: NSButton! @IBOutlet var twentyHourCheckbox: NSButton! - @IBOutlet var autoInstallUpdatesCheckbox: NSButton! @IBOutlet var drawEmptyDigitsCheckbox: NSButton! @IBOutlet var versionLabel: NSTextField! @@ -37,19 +35,6 @@ final class PreferencesWindowController: NSWindowController { if let version = preferences.bundle.infoDictionary?["CFBundleShortVersionString"] as? String { versionLabel.stringValue = "Predator's version \(version)" } - - // Sparkle - NotificationCenter.default.addObserver( - self, - selector: #selector(sparkleWillRestart), - name: .SUUpdaterWillRestart, - object: nil - ) - - autoInstallUpdatesCheckbox.state = preferences.autoUpdates ? .on : .off - - let updater = SUUpdater(for: Bundle(for: PreferencesWindowController.self)) - updater?.checkForUpdatesInBackground() } @objc func sparkleWillRestart() { @@ -79,10 +64,6 @@ extension PreferencesWindowController { previewView.setNeedsDisplay(previewView.bounds) } - @IBAction func autoInstallUpdatesAction(_ sender: NSButton) { - preferences.autoUpdates = sender.state == .on ? true : false - } - @IBAction func drawEmptyDigitsAction(_ sender: NSButton) { preferences.drawEmptyDigits = sender.state == .on ? true : false previewView.setNeedsDisplay(previewView.bounds) diff --git a/Predator/Preferences/PreferencesWindowController.xib b/Predator/Preferences/PreferencesWindowController.xib index 40b60cd..e090bfc 100644 --- a/Predator/Preferences/PreferencesWindowController.xib +++ b/Predator/Preferences/PreferencesWindowController.xib @@ -8,7 +8,6 @@ - @@ -30,7 +29,7 @@ - + @@ -41,11 +40,11 @@ - + - + @@ -128,19 +127,6 @@ DQ - @@ -160,7 +146,7 @@ DQ