Skip to content
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

Jump to bottom

Upgrade to Redis 7 #17

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade to Redis 7 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96f52ae
wip working
StefanoDeVuono Jul 23, 2022
adc1eec
Switch to sparkle using Swift Package Manager
StefanoDeVuono Jul 23, 2022
a57062e
sparkle update
StefanoDeVuono Jul 23, 2022
999e0da
remove bridging header
StefanoDeVuono Jul 23, 2022
2aab6d9
revert build config back to José
StefanoDeVuono Jul 23, 2022
74a4a33
remove bridging header
StefanoDeVuono Jul 26, 2022
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
64 changes: 46 additions & 18 deletions Redis.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
3D4733611C7144F300436F9E /* Vendor in Resources */ = {isa = PBXBuildFile; fileRef = 3D4733601C7144F200436F9E /* Vendor */; };
3D6942681C71536A00773365 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D6942671C71536A00773365 /* Sparkle.framework */; };
3D69426A1C71542900773365 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3D6942671C71536A00773365 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3D7F38551C702A3000818E3E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D7F38541C702A3000818E3E /* AppDelegate.swift */; };
3D7F38571C702A3000818E3E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3D7F38561C702A3000818E3E /* Assets.xcassets */; };
3D7F385A1C702A3000818E3E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3D7F38581C702A3000818E3E /* MainMenu.xib */; };
5E0EA038288BF4540087D89B /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 5E0EA037288BF4540087D89B /* Sparkle */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -22,16 +21,13 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
3D69426A1C71542900773365 /* Sparkle.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
3D4733601C7144F200436F9E /* Vendor */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Vendor; sourceTree = "<group>"; };
3D6942671C71536A00773365 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Redis/Sparkle.framework; sourceTree = "<group>"; };
3D69426B1C71560000773365 /* Redis-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Redis-Bridging-Header.h"; sourceTree = "<group>"; };
3D7F38511C702A3000818E3E /* Redis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Redis.app; sourceTree = BUILT_PRODUCTS_DIR; };
3D7F38541C702A3000818E3E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3D7F38561C702A3000818E3E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand All @@ -44,7 +40,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3D6942681C71536A00773365 /* Sparkle.framework in Frameworks */,
5E0EA038288BF4540087D89B /* Sparkle in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -74,15 +70,13 @@
3D7F38561C702A3000818E3E /* Assets.xcassets */,
3D7F38581C702A3000818E3E /* MainMenu.xib */,
3D7F38631C702DA200818E3E /* Supporting Files */,
3D69426B1C71560000773365 /* Redis-Bridging-Header.h */,
);
path = Redis;
sourceTree = "<group>";
};
3D7F38631C702DA200818E3E /* Supporting Files */ = {
isa = PBXGroup;
children = (
3D6942671C71536A00773365 /* Sparkle.framework */,
3D4733601C7144F200436F9E /* Vendor */,
3D7F385B1C702A3000818E3E /* Info.plist */,
);
Expand All @@ -107,6 +101,9 @@
dependencies = (
);
name = Redis;
packageProductDependencies = (
5E0EA037288BF4540087D89B /* Sparkle */,
);
productName = Redis;
productReference = 3D7F38511C702A3000818E3E /* Redis.app */;
productType = "com.apple.product-type.application";
Expand All @@ -125,6 +122,7 @@
CreatedOnToolsVersion = 7.2.1;
DevelopmentTeam = FJZ2YT5Y98;
LastSwiftMigration = 0820;
ProvisioningStyle = Automatic;
};
};
};
Expand All @@ -133,10 +131,14 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
mainGroup = 3D7F38481C702A3000818E3E;
packageReferences = (
5E0EA036288BF4540087D89B /* XCRemoteSwiftPackageReference "Sparkle" */,
);
productRefGroup = 3D7F38521C702A3000818E3E /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -263,51 +265,58 @@
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
};
name = Release;
};
3D7F385F1C702A3000818E3E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Developer ID Application: Blimp, LLC (FJZ2YT5Y98)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: Blimp, LLC (FJZ2YT5Y98)";
CODE_SIGN_IDENTITY = "Developer ID Application";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = FJZ2YT5Y98;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/Redis",
);
INFOPLIST_FILE = Redis/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = io.blimp.Redis;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "Redis/Redis-Bridging-Header.h";
SWIFT_VERSION = 3.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
3D7F38601C702A3000818E3E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Developer ID Application: Blimp, LLC (FJZ2YT5Y98)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: Blimp, LLC (FJZ2YT5Y98)";
CODE_SIGN_IDENTITY = "Developer ID Application";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = FJZ2YT5Y98;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/Redis",
);
INFOPLIST_FILE = Redis/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = io.blimp.Redis;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "Redis/Redis-Bridging-Header.h";
SWIFT_VERSION = 3.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -333,6 +342,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
5E0EA036288BF4540087D89B /* XCRemoteSwiftPackageReference "Sparkle" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "git@github.com:sparkle-project/Sparkle.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
5E0EA037288BF4540087D89B /* Sparkle */ = {
isa = XCSwiftPackageProductDependency;
package = 5E0EA036288BF4540087D89B /* XCRemoteSwiftPackageReference "Sparkle" */;
productName = Sparkle;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 3D7F38491C702A3000818E3E /* Project object */;
}
2 changes: 1 addition & 1 deletion Redis.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Redis.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
14 changes: 14 additions & 0 deletions Redis.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"pins" : [
{
"identity" : "sparkle",
"kind" : "remoteSourceControl",
"location" : "git@github.com:sparkle-project/Sparkle.git",
"state" : {
"revision" : "059ce9128775d5a636c7f4716f71a58919d3111e",
"version" : "2.2.1"
}
}
],
"version" : 2
}
24 changes: 13 additions & 11 deletions Redis/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
//

import Cocoa
import Sparkle

@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
@IBOutlet weak var updater: SUUpdater!

let updaterController: SPUStandardUpdaterController
var paths = NSSearchPathForDirectoriesInDomains(
FileManager.SearchPathDirectory.documentDirectory,
FileManager.SearchPathDomainMask.userDomainMask, true)
Expand All @@ -24,7 +25,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
var pipe: Pipe = Pipe()
var file: FileHandle

var statusBar = NSStatusBar.system()
var statusBar = NSStatusBar.system
var statusBarItem: NSStatusItem = NSStatusItem()
var menu: NSMenu = NSMenu()

Expand All @@ -42,6 +43,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
self.documentsDirectory = self.paths[0] as AnyObject
self.dataPath = documentsDirectory.appendingPathComponent("RedisData")
self.logPath = documentsDirectory.appendingPathComponent("RedisData/Logs")
self.updaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)

super.init()
}
Expand Down Expand Up @@ -74,7 +76,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
print(output)
}

func openCLI(_ sender: AnyObject) {
@objc func openCLI(_ sender: AnyObject) {
if let path = Bundle.main.path(forResource: "redis-cli", ofType: "", inDirectory: "Vendor/redis/bin") {
var source: String

Expand All @@ -99,14 +101,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
}

func openDocumentationPage(_ send: AnyObject) {
@objc func openDocumentationPage(_ send: AnyObject) {
if let url: URL = URL(string: "https://github.com/jpadilla/redisapp") {
NSWorkspace.shared().open(url)
NSWorkspace.shared.open(url)
}
}

func openLogsDirectory(_ send: AnyObject) {
NSWorkspace.shared().openFile(self.logPath)
@objc func openLogsDirectory(_ send: AnyObject) {
NSWorkspace.shared.openFile(self.logPath)
}

func createDirectories() {
Expand All @@ -132,9 +134,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
print("Redis logs directory: \(self.logPath)")
}

func checkForUpdates(_ sender: AnyObject?) {
@objc func checkForUpdates(_ sender: AnyObject?) {
print("Checking for updates")
self.updater.checkForUpdates(sender)
self.updaterController.checkForUpdates(sender)
}

func setupSystemMenuItem() {
Expand Down Expand Up @@ -194,7 +196,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {

// Add quitMenuItem to menu
quitMenuItem.title = "Quit"
quitMenuItem.action = #selector(NSApplication.shared().terminate)
quitMenuItem.action = #selector(NSApplication.shared.terminate)
menu.addItem(quitMenuItem)
}

Expand Down
9 changes: 5 additions & 4 deletions Redis/Base.lproj/MainMenu.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
Expand All @@ -18,7 +18,7 @@
</connections>
</customObject>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<customObject id="79h-fN-jeA" customClass="SUUpdater"/>
<customObject id="79h-fN-jeA" customClass="SUUpdater" customModule="Redis"/>
<menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="Redis" id="1Xt-HY-uBw">
Expand Down Expand Up @@ -667,6 +667,7 @@
</menu>
</menuItem>
</items>
<point key="canvasLocation" x="139" y="135"/>
</menu>
</objects>
</document>
4 changes: 2 additions & 2 deletions Redis/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.0.2-build.1</string>
<string>7.0.4-build.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>4.0.2-build.1</string>
<string>7.0.4-build.1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key>
Expand Down
9 changes: 0 additions & 9 deletions Redis/Redis-Bridging-Header.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Redis/Sparkle.framework/Headers
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Redis/Sparkle.framework/Modules
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Redis/Sparkle.framework/PrivateHeaders
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Redis/Sparkle.framework/Resources
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Redis/Sparkle.framework/Sparkle
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions Redis/Sparkle.framework/Versions/A/Headers/SUAppcast.h
View file
Open in desktop

This file was deleted.

Loading