Skip to content

Remove sparkle, remove network entitlements #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javaidea wants to merge 1 commit into from
Closed

Remove sparkle, remove network entitlements #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion sparkle/framework/Version-2.6.0
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions sparkle/generate_appcast.sh
View file
Open in desktop

This file was deleted.

28 changes: 8 additions & 20 deletions src/Caffeine.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
F21DAB042C3040F70044ACF2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F21DAB032C3040F70044ACF2 /* Assets.xcassets */; };
F21DAB112C30422A0044ACF2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F21DAB0F2C30422A0044ACF2 /* AppDelegate.swift */; };
F21DAB1A2C3042430044ACF2 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F21DAB172C3042430044ACF2 /* MainMenu.xib */; };
F21DAB1F2C30449A0044ACF2 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F21DAB1D2C3044870044ACF2 /* Sparkle.framework */; };
F21DAB202C30449A0044ACF2 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F21DAB1D2C3044870044ACF2 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F21DAB242C3044A20044ACF2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F21DAB232C3044A20044ACF2 /* IOKit.framework */; };
F21DAB2C2C30483A0044ACF2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F21DAB272C30483A0044ACF2 /* Localizable.strings */; };
F21DAB2D2C30483A0044ACF2 /* MainMenu.strings in Resources */ = {isa = PBXBuildFile; fileRef = F21DAB292C30483A0044ACF2 /* MainMenu.strings */; };
Expand All @@ -31,7 +29,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
F21DAB202C30449A0044ACF2 /* Sparkle.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -45,7 +42,6 @@
F21DAB0F2C30422A0044ACF2 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F21DAB132C30423D0044ACF2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F21DAB182C3042430044ACF2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
F21DAB1D2C3044870044ACF2 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../sparkle/framework/Sparkle.framework; sourceTree = "<group>"; };
F21DAB232C3044A20044ACF2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
F21DAB282C30483A0044ACF2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
F21DAB2A2C30483A0044ACF2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
Expand Down Expand Up @@ -96,7 +92,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
F21DAB1F2C30449A0044ACF2 /* Sparkle.framework in Frameworks */,
F21DAB242C3044A20044ACF2 /* IOKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -107,7 +102,6 @@
F21DAAF32C3040F50044ACF2 = {
isa = PBXGroup;
children = (
F21DAB0E2C3041ED0044ACF2 /* Sparkle */,
F21DAAFE2C3040F50044ACF2 /* Caffeine */,
F21DAAFD2C3040F50044ACF2 /* Products */,
F21DAB222C3044A20044ACF2 /* Frameworks */,
Expand All @@ -131,14 +125,6 @@
path = Caffeine;
sourceTree = "<group>";
};
F21DAB0E2C3041ED0044ACF2 /* Sparkle */ = {
isa = PBXGroup;
children = (
F21DAB1D2C3044870044ACF2 /* Sparkle.framework */,
);
name = Sparkle;
sourceTree = "<group>";
};
F21DAB102C30422A0044ACF2 /* Classes */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -481,10 +467,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Caffeine/Caffeine.entitlements;
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 21;
DEVELOPMENT_TEAM = 568T6RKXH7;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = ../sparkle/framework;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -499,8 +485,9 @@
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.4.3;
PRODUCT_BUNDLE_IDENTIFIER = net.domzilla.caffeine;
PRODUCT_BUNDLE_IDENTIFIER = me.javaidea.caffeine;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
};
Expand All @@ -512,10 +499,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Caffeine/Caffeine.entitlements;
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 21;
DEVELOPMENT_TEAM = 568T6RKXH7;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = ../sparkle/framework;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -530,8 +517,9 @@
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.4.3;
PRODUCT_BUNDLE_IDENTIFIER = net.domzilla.caffeine;
PRODUCT_BUNDLE_IDENTIFIER = me.javaidea.caffeine;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
};
Expand Down
9 changes: 2 additions & 7 deletions src/Caffeine/Caffeine.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<false/>
<key>com.apple.security.network.server</key>
<true/>
<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
<array>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spks</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)-spki</string>
</array>
<false/>
</dict>
</plist>
16 changes: 4 additions & 12 deletions src/Caffeine/Classes/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@

import Cocoa
import IOKit.pwr_mgt
import Sparkle

@main
class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SPUStandardUserDriverDelegate {
class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {

var isActive:Bool
var userSessionIsActive:Bool
Expand All @@ -28,7 +27,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SPUStandardU
@IBOutlet var infoSeparatorItem:NSMenuItem!

var preferencesWindowController:PreferencesWindowController!
var updaterController:SPUStandardUpdaterController!

override init() {
self.isActive = false
Expand Down Expand Up @@ -60,9 +58,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SPUStandardU
UserDefaults.standard.register(defaults: ["CASuppressLaunchMessage" : false])

preferencesWindowController = PreferencesWindowController(windowNibName: "PreferencesWindowController")
updaterController = SPUStandardUpdaterController(startingUpdater: true,
updaterDelegate: nil,
userDriverDelegate: self);

if !UserDefaults.standard.bool(forKey: "CASuppressLaunchMessage") {
self.showPreferences(nil)
Expand Down Expand Up @@ -118,7 +113,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SPUStandardU
@IBAction func statusItemAction(_ sender:Any?) {
let event = NSApp.currentEvent
if event?.type == .rightMouseUp {
statusItem.popUpMenu(menu)
statusItem.menu = menu
statusItem.button?.performClick(nil)
statusItem.menu = nil
} else {
toggleActive(sender)
}
Expand Down Expand Up @@ -151,11 +148,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, SPUStandardU
preferencesWindowController.showWindow(self)
}

@IBAction func checkForUpdates(_ sender:Any?) {
updaterController.checkForUpdates(sender)
}


// MARK: Public
// MARK: ---
func activate() {
Expand Down