Skip to content

Commit

Permalink
Move from Sparkle to UpdateNotification.
Browse files Browse the repository at this point in the history
  • Loading branch information
melgu committed May 9, 2020
1 parent 9bf6160 commit 3c1fa9a
Show file tree
Hide file tree
Showing 200 changed files with 43 additions and 6,377 deletions.
35 changes: 23 additions & 12 deletions Denon Volume.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@

/* Begin PBXBuildFile section */
B069B3EF2314B2100019190C /* HotKey in Frameworks */ = {isa = PBXBuildFile; productRef = B069B3EE2314B2100019190C /* HotKey */; };
B069B3F22314B2950019190C /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B069B3F02314B2740019190C /* Sparkle.framework */; };
B069B3F32314B2950019190C /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B069B3F02314B2740019190C /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B09D71AA24661847004E171C /* UpdateNotification in Frameworks */ = {isa = PBXBuildFile; productRef = B09D71A924661847004E171C /* UpdateNotification */; };
B0B99AB31EC21DD800627E65 /* RegexString.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0B99AB21EC21DD800627E65 /* RegexString.swift */; };
B0CAAB501EBBC11100A1E8BF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0CAAB4F1EBBC11100A1E8BF /* AppDelegate.swift */; };
B0CAAB541EBBC11100A1E8BF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B0CAAB531EBBC11100A1E8BF /* Assets.xcassets */; };
Expand Down Expand Up @@ -74,15 +73,13 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
B069B3F32314B2950019190C /* Sparkle.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
B045C0E120E5998000D74DAA /* Denon Volume.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "Denon Volume.entitlements"; sourceTree = "<group>"; };
B069B3F02314B2740019190C /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = SOURCE_ROOT; };
B0B99AB21EC21DD800627E65 /* RegexString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegexString.swift; sourceTree = "<group>"; };
B0CAAB4C1EBBC11100A1E8BF /* Denon Volume.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Denon Volume.app"; sourceTree = BUILT_PRODUCTS_DIR; };
B0CAAB4F1EBBC11100A1E8BF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -112,8 +109,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B09D71AA24661847004E171C /* UpdateNotification in Frameworks */,
B069B3EF2314B2100019190C /* HotKey in Frameworks */,
B069B3F22314B2950019190C /* Sparkle.framework in Frameworks */,
B0DB1C5E1F3A3A7F0037ABC3 /* DFRFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -199,7 +196,6 @@
isa = PBXGroup;
children = (
B0DB1C5D1F3A3A7F0037ABC3 /* DFRFoundation.framework */,
B069B3F02314B2740019190C /* Sparkle.framework */,
);
name = Frameworks;
path = "Denon VolumeTests";
Expand Down Expand Up @@ -234,6 +230,7 @@
name = "Denon Volume";
packageProductDependencies = (
B069B3EE2314B2100019190C /* HotKey */,
B09D71A924661847004E171C /* UpdateNotification */,
);
productName = "Denon Volume";
productReference = B0CAAB4C1EBBC11100A1E8BF /* Denon Volume.app */;
Expand Down Expand Up @@ -330,6 +327,7 @@
mainGroup = B0CAAB431EBBC11100A1E8BF;
packageReferences = (
B069B3ED2314B2100019190C /* XCRemoteSwiftPackageReference "HotKey" */,
B09D71A824661847004E171C /* XCRemoteSwiftPackageReference "updatenotification" */,
);
productRefGroup = B0CAAB4D1EBBC11100A1E8BF /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -615,7 +613,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.19;
CURRENT_PROJECT_VERSION = 1.20;
DEVELOPMENT_TEAM = V7E5P7292M;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -628,8 +626,8 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 1.19;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.20;
PRODUCT_BUNDLE_IDENTIFIER = "com.melgu.Denon-Volume";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -646,7 +644,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.19;
CURRENT_PROJECT_VERSION = 1.20;
DEVELOPMENT_TEAM = V7E5P7292M;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -659,8 +657,8 @@
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 1.19;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.20;
PRODUCT_BUNDLE_IDENTIFIER = "com.melgu.Denon-Volume";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -831,6 +829,14 @@
minimumVersion = 0.1.2;
};
};
B09D71A824661847004E171C /* XCRemoteSwiftPackageReference "updatenotification" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "[email protected]:MikelG/updatenotification.git";
requirement = {
branch = master;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand All @@ -839,6 +845,11 @@
package = B069B3ED2314B2100019190C /* XCRemoteSwiftPackageReference "HotKey" */;
productName = HotKey;
};
B09D71A924661847004E171C /* UpdateNotification */ = {
isa = XCSwiftPackageProductDependency;
package = B09D71A824661847004E171C /* XCRemoteSwiftPackageReference "updatenotification" */;
productName = UpdateNotification;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = B0CAAB441EBBC11100A1E8BF /* Project object */;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@
"repositoryURL": "[email protected]:soffes/HotKey.git",
"state": {
"branch": null,
"revision": "9984df7d4adbd0e7ab7622d2f107f67c0834aefb",
"version": "0.1.2"
"revision": "c13662730cb5bc28de4a799854bbb018a90649bf",
"version": "0.1.3"
}
},
{
"package": "UpdateNotification",
"repositoryURL": "[email protected]:MikelG/updatenotification.git",
"state": {
"branch": "master",
"revision": "10d8b46a06b1d77871a87608aeb5303e2e25752d",
"version": null
}
}
]
Expand Down
7 changes: 7 additions & 0 deletions Denon Volume/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import Cocoa
import HotKey
import UpdateNotification

@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate, NSTouchBarDelegate {
Expand All @@ -17,6 +18,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTouchBarDelegate {
// Objects
let denonCommunicator = DenonCommunicator()
var menuViewController: MenuViewController?
let updateNotification = UpdateNotification(feedUrl: URL(string: "http://www.melvin-gundlach.de/apps/app-feeds/Denon-Volume.json")!)

// Global Hotkeys
var hotKeyVolumeUpBig: HotKey?
Expand Down Expand Up @@ -259,6 +261,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTouchBarDelegate {
print("presentTouchBarMenu finished")
NSTouchBarItem.addSystemTrayItem(controlBarIcon)
NSTouchBar.minimizeSystemModalTouchBar(groupTouchBar)
print("Touch Bar finished")

if updateNotification.checkForUpdates() {
updateNotification.showNewVersionView()
}
print("applicationDidFinishLaunching finished")
}

Expand Down
6 changes: 2 additions & 4 deletions Denon Volume/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14835.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14835.7"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
</dependencies>
<scenes>
<!--Application-->
<scene sceneID="JPo-4y-FX3">
<objects>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Denon_Volume" customModuleProvider="target"/>
<customObject id="v59-as-wdD" customClass="SUUpdater"/>
<application id="hnw-xV-0zn" sceneMemberID="viewController">
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
Expand Down
6 changes: 0 additions & 6 deletions Denon Volume/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,5 @@
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
<string>http://melvin-gundlach.de/apps/denon-volume/appcast.xml</string>
<key>SUPublicDSAKeyFile</key>
<string>dsa_pub.pem</string>
<key>SUPublicEDKey</key>
<string>uu1tKSBLrSBPm/dLlsdrcAMjWssqDiO/lOxDqGZMIc4=</string>
</dict>
</plist>
1 change: 0 additions & 1 deletion Frameworks/Sparkle.framework/Headers

This file was deleted.

1 change: 0 additions & 1 deletion Frameworks/Sparkle.framework/Modules

This file was deleted.

1 change: 0 additions & 1 deletion Frameworks/Sparkle.framework/PrivateHeaders

This file was deleted.

1 change: 0 additions & 1 deletion Frameworks/Sparkle.framework/Resources

This file was deleted.

1 change: 0 additions & 1 deletion Frameworks/Sparkle.framework/Sparkle

This file was deleted.

43 changes: 0 additions & 43 deletions Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h

This file was deleted.

25 changes: 0 additions & 25 deletions Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloader.h

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3c1fa9a

Please sign in to comment.