Skip to content

Commit e9b6c6c

Browse files
streetturtlestreetturtle
authored
Merge pull request #36 from menubar-apps/add-sequoia-support
1.12
2 parents 0ff4449 + 797b0f7 commit e9b6c6c

File tree

30 files changed

+232
-192
lines changed

30 files changed

+232
-192
lines changed

‎pullBar.xcodeproj/project.pbxproj

+26-39
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
76181DD52D7CC83000D4D7CB /* AppView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76181DD42D7CC83000D4D7CB /* AppView.swift */; };
11+
76181DD72D7CC84800D4D7CB /* AppPromotionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76181DD62D7CC84800D4D7CB /* AppPromotionView.swift */; };
12+
761B97072D7CCDA70000378A /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 761B97062D7CCDA70000378A /* LaunchAtLogin */; };
1013
768A4C5528AF253C004E557E /* BottomItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 768A4C5428AF253C004E557E /* BottomItemView.swift */; };
11-
7695CC3E2C99F717004EAB35 /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = 7695CC3D2C99F717004EAB35 /* LaunchAtLogin */; };
1214
769F4E1B2765A2B900594911 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769F4E1A2765A2B900594911 /* AboutView.swift */; };
1315
769F4E7B277B97B300594911 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769F4E7A277B97B300594911 /* Notifications.swift */; };
1416
769F4E7D277CAFAD00594911 /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769F4E7C277CAFAD00594911 /* StringExtensions.swift */; };
@@ -30,6 +32,8 @@
3032
/* End PBXBuildFile section */
3133

3234
/* Begin PBXFileReference section */
35+
76181DD42D7CC83000D4D7CB /* AppView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppView.swift; sourceTree = "<group>"; };
36+
76181DD62D7CC84800D4D7CB /* AppPromotionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppPromotionView.swift; sourceTree = "<group>"; };
3337
768A4C5428AF253C004E557E /* BottomItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomItemView.swift; sourceTree = "<group>"; };
3438
769F4E1A2765A2B900594911 /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
3539
769F4E7A277B97B300594911 /* Notifications.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
@@ -57,7 +61,7 @@
5761
files = (
5862
76C6AA5B2C98E809003472DA /* Defaults in Frameworks */,
5963
8CECBBFB2742ABE600A2802D /* Alamofire in Frameworks */,
60-
7695CC3E2C99F717004EAB35 /* LaunchAtLogin in Frameworks */,
64+
761B97072D7CCDA70000378A /* LaunchAtLogin in Frameworks */,
6165
76D5F9E428D28958009EBD80 /* KeychainAccess in Frameworks */,
6266
);
6367
runOnlyForDeploymentPostprocessing = 0;
@@ -133,6 +137,8 @@
133137
8CECBC002742B3A000A2802D /* PreferencesView.swift */,
134138
769F4E1A2765A2B900594911 /* AboutView.swift */,
135139
768A4C5428AF253C004E557E /* BottomItemView.swift */,
140+
76181DD42D7CC83000D4D7CB /* AppView.swift */,
141+
76181DD62D7CC84800D4D7CB /* AppPromotionView.swift */,
136142
);
137143
path = Views;
138144
sourceTree = "<group>";
@@ -147,7 +153,6 @@
147153
8CECBBDB2742AAF800A2802D /* Sources */,
148154
8CECBBDC2742AAF800A2802D /* Frameworks */,
149155
8CECBBDD2742AAF800A2802D /* Resources */,
150-
7695CC3F2C99F729004EAB35 /* Copy Launch at Login Helper */,
151156
);
152157
buildRules = (
153158
);
@@ -158,7 +163,7 @@
158163
8CECBBFA2742ABE600A2802D /* Alamofire */,
159164
76D5F9E328D28958009EBD80 /* KeychainAccess */,
160165
76C6AA5A2C98E809003472DA /* Defaults */,
161-
7695CC3D2C99F717004EAB35 /* LaunchAtLogin */,
166+
761B97062D7CCDA70000378A /* LaunchAtLogin */,
162167
);
163168
productName = pullBar;
164169
productReference = 8CECBBDF2742AAF800A2802D /* pullBar.app */;
@@ -192,7 +197,7 @@
192197
8CECBBF62742ABDA00A2802D /* XCRemoteSwiftPackageReference "Defaults" */,
193198
8CECBBF92742ABE600A2802D /* XCRemoteSwiftPackageReference "Alamofire" */,
194199
76D5F9E228D28958009EBD80 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
195-
7695CC3C2C99F717004EAB35 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Legacy" */,
200+
761B97052D7CCDA70000378A /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */,
196201
);
197202
productRefGroup = 8CECBBE02742AAF800A2802D /* Products */;
198203
projectDirPath = "";
@@ -215,28 +220,6 @@
215220
};
216221
/* End PBXResourcesBuildPhase section */
217222

218-
/* Begin PBXShellScriptBuildPhase section */
219-
7695CC3F2C99F729004EAB35 /* Copy Launch at Login Helper */ = {
220-
isa = PBXShellScriptBuildPhase;
221-
alwaysOutOfDate = 1;
222-
buildActionMask = 2147483647;
223-
files = (
224-
);
225-
inputFileListPaths = (
226-
);
227-
inputPaths = (
228-
);
229-
name = "Copy Launch at Login Helper";
230-
outputFileListPaths = (
231-
);
232-
outputPaths = (
233-
);
234-
runOnlyForDeploymentPostprocessing = 0;
235-
shellPath = /bin/sh;
236-
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\"${BUILT_PRODUCTS_DIR}/LaunchAtLogin_LaunchAtLogin.bundle/Contents/Resources/copy-helper-swiftpm.sh\"\n";
237-
};
238-
/* End PBXShellScriptBuildPhase section */
239-
240223
/* Begin PBXSourcesBuildPhase section */
241224
8CECBBDB2742AAF800A2802D /* Sources */ = {
242225
isa = PBXSourcesBuildPhase;
@@ -246,10 +229,12 @@
246229
8C55444B274AD7B20079CA42 /* DateExtensions.swift in Sources */,
247230
8CECBC022742B3A000A2802D /* PreferencesView.swift in Sources */,
248231
769F4E7B277B97B300594911 /* Notifications.swift in Sources */,
232+
76181DD72D7CC84800D4D7CB /* AppPromotionView.swift in Sources */,
249233
8CECBBE32742AAF900A2802D /* AppDelegate.swift in Sources */,
250234
76F7DAD028A88CAB0086A3B0 /* GithubTokenValidator.swift in Sources */,
251235
8CECBBF52742AB3F00A2802D /* GitHubDtos.swift in Sources */,
252236
768A4C5528AF253C004E557E /* BottomItemView.swift in Sources */,
237+
76181DD52D7CC83000D4D7CB /* AppView.swift in Sources */,
253238
769F4E1B2765A2B900594911 /* AboutView.swift in Sources */,
254239
8CECBC0927436C2200A2802D /* NSMutableAttributedStringExtensions.swift in Sources */,
255240
8CECBBF42742AB3F00A2802D /* GitHubClient.swift in Sources */,
@@ -402,7 +387,7 @@
402387
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
403388
CODE_SIGN_STYLE = Automatic;
404389
COMBINE_HIDPI_IMAGES = YES;
405-
CURRENT_PROJECT_VERSION = 14gh;
390+
CURRENT_PROJECT_VERSION = "16(gh)";
406391
DEAD_CODE_STRIPPING = YES;
407392
DEVELOPMENT_TEAM = UV3HUS49VJ;
408393
ENABLE_HARDENED_RUNTIME = YES;
@@ -416,7 +401,8 @@
416401
"$(inherited)",
417402
"@executable_path/../Frameworks",
418403
);
419-
MARKETING_VERSION = 1.10;
404+
MACOSX_DEPLOYMENT_TARGET = 13;
405+
MARKETING_VERSION = 1.12;
420406
PRODUCT_BUNDLE_IDENTIFIER = debug.com.pavelmakhov.pullBar;
421407
PRODUCT_NAME = "$(TARGET_NAME)";
422408
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -434,7 +420,7 @@
434420
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
435421
CODE_SIGN_STYLE = Automatic;
436422
COMBINE_HIDPI_IMAGES = YES;
437-
CURRENT_PROJECT_VERSION = 14gh;
423+
CURRENT_PROJECT_VERSION = "16(gh)";
438424
DEAD_CODE_STRIPPING = YES;
439425
DEVELOPMENT_TEAM = UV3HUS49VJ;
440426
ENABLE_HARDENED_RUNTIME = YES;
@@ -448,7 +434,8 @@
448434
"$(inherited)",
449435
"@executable_path/../Frameworks",
450436
);
451-
MARKETING_VERSION = 1.10;
437+
MACOSX_DEPLOYMENT_TARGET = 13;
438+
MARKETING_VERSION = 1.12;
452439
PRODUCT_BUNDLE_IDENTIFIER = com.pavelmakhov.pullBar;
453440
PRODUCT_NAME = "$(TARGET_NAME)";
454441
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -480,12 +467,12 @@
480467
/* End XCConfigurationList section */
481468

482469
/* Begin XCRemoteSwiftPackageReference section */
483-
7695CC3C2C99F717004EAB35 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Legacy" */ = {
470+
761B97052D7CCDA70000378A /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */ = {
484471
isa = XCRemoteSwiftPackageReference;
485-
repositoryURL = "https://github.com/sindresorhus/LaunchAtLogin-Legacy";
472+
repositoryURL = "https://github.com/sindresorhus/LaunchAtLogin-Modern";
486473
requirement = {
487-
branch = main;
488-
kind = branch;
474+
kind = exactVersion;
475+
version = 1.1.0;
489476
};
490477
};
491478
76D5F9E228D28958009EBD80 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
@@ -500,8 +487,8 @@
500487
isa = XCRemoteSwiftPackageReference;
501488
repositoryURL = "https://github.com/sindresorhus/Defaults";
502489
requirement = {
503-
branch = main;
504-
kind = branch;
490+
kind = exactVersion;
491+
version = 8.2.0;
505492
};
506493
};
507494
8CECBBF92742ABE600A2802D /* XCRemoteSwiftPackageReference "Alamofire" */ = {
@@ -515,9 +502,9 @@
515502
/* End XCRemoteSwiftPackageReference section */
516503

517504
/* Begin XCSwiftPackageProductDependency section */
518-
7695CC3D2C99F717004EAB35 /* LaunchAtLogin */ = {
505+
761B97062D7CCDA70000378A /* LaunchAtLogin */ = {
519506
isa = XCSwiftPackageProductDependency;
520-
package = 7695CC3C2C99F717004EAB35 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Legacy" */;
507+
package = 761B97052D7CCDA70000378A /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */;
521508
productName = LaunchAtLogin;
522509
};
523510
76C6AA5A2C98E809003472DA /* Defaults */ = {

‎pullBar.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"originHash" : "de88b4e3acd0459cb33360c3cb3c9525e47d50d144b21866ea79c3fa7c6d021e",
2+
"originHash" : "22c866ea327f6db938d479f8e16cd618a46a1ba6c0503558514381243c714979",
33
"pins" : [
44
{
55
"identity" : "alamofire",
@@ -15,8 +15,8 @@
1515
"kind" : "remoteSourceControl",
1616
"location" : "https://github.com/sindresorhus/Defaults",
1717
"state" : {
18-
"branch" : "main",
19-
"revision" : "5b30f01e46d25f7b59e37d6d96b2030d6c96ac87"
18+
"revision" : "38925e3cfacf3fb89a81a35b1cd44fd5a5b7e0fa",
19+
"version" : "8.2.0"
2020
}
2121
},
2222
{
@@ -29,12 +29,12 @@
2929
}
3030
},
3131
{
32-
"identity" : "launchatlogin-legacy",
32+
"identity" : "launchatlogin-modern",
3333
"kind" : "remoteSourceControl",
34-
"location" : "https://github.com/sindresorhus/LaunchAtLogin-Legacy",
34+
"location" : "https://github.com/sindresorhus/LaunchAtLogin-Modern",
3535
"state" : {
36-
"branch" : "main",
37-
"revision" : "9a894d799269cb591037f9f9cb0961510d4dca81"
36+
"revision" : "a04ec1c363be3627734f6dad757d82f5d4fa8fcc",
37+
"version" : "1.1.0"
3838
}
3939
}
4040
],

‎pullBar/AppDelegate.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ extension AppDelegate {
318318
self.menu.addItem(.separator())
319319
self.menu.addItem(withTitle: "Preferences...", action: #selector(self.openPrefecencesWindow), keyEquivalent: "")
320320
// Remove for app store release
321-
self.menu.addItem(withTitle: "Check for updates...", action: #selector(self.checkForUpdates), keyEquivalent: "")
321+
// self.menu.addItem(withTitle: "Check for updates...", action: #selector(self.checkForUpdates), keyEquivalent: "")
322322
self.menu.addItem(withTitle: "About PullBar", action: #selector(self.openAboutWindow), keyEquivalent: "")
323323
self.menu.addItem(withTitle: "Quit", action: #selector(self.quit), keyEquivalent: "")
324324
}
@@ -360,7 +360,7 @@ extension AppDelegate {
360360
aboutWindow.close()
361361
}
362362
aboutWindow = NSWindow(
363-
contentRect: NSRect(x: 0, y: 0, width: 240, height: 340),
363+
contentRect: NSRect(x: 0, y: 0, width: 240, height: 500),
364364
styleMask: [.closable, .titled],
365365
backing: .buffered,
366366
defer: false

‎pullBar/Assets.xcassets/alert.imageset/Contents.json

+4-10
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,14 @@
22
"images" : [
33
{
44
"filename" : "alert.pdf",
5-
"idiom" : "universal",
6-
"scale" : "1x"
7-
},
8-
{
9-
"idiom" : "universal",
10-
"scale" : "2x"
11-
},
12-
{
13-
"idiom" : "universal",
14-
"scale" : "3x"
5+
"idiom" : "universal"
156
}
167
],
178
"info" : {
189
"author" : "xcode",
1910
"version" : 1
11+
},
12+
"properties" : {
13+
"template-rendering-intent" : "template"
2014
}
2115
}

‎pullBar/Assets.xcassets/apps/Contents.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎pullBar/Assets.xcassets/apps/gojibar.imageset/256.png

40.7 KB
Loading

‎pullBar/Assets.xcassets/apps/gojibar.imageset/Contents.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "256.png",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎pullBar/Assets.xcassets/apps/pullbarpro.imageset/256.png

19.6 KB
Loading

‎pullBar/Assets.xcassets/apps/pullbarpro.imageset/Contents.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "256.png",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎pullBar/Assets.xcassets/apps/streakbar.imageset/256.png

29.3 KB
Loading

‎pullBar/Assets.xcassets/apps/streakbar.imageset/Contents.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "256.png",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎pullBar/Assets.xcassets/apps/todobar.imageset/256.png

25.9 KB
Loading

‎pullBar/Assets.xcassets/apps/todobar.imageset/Contents.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "256.png",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

‎pullBar/Assets.xcassets/calendar.imageset/Contents.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22
"images" : [
33
{
44
"filename" : "calendar.pdf",
5-
"idiom" : "universal",
6-
"scale" : "1x"
7-
},
8-
{
9-
"idiom" : "universal",
10-
"scale" : "2x"
11-
},
12-
{
13-
"idiom" : "universal",
14-
"scale" : "3x"
5+
"idiom" : "universal"
156
}
167
],
178
"info" : {

‎pullBar/Assets.xcassets/check-circle-fill.imageset/Contents.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22
"images" : [
33
{
44
"filename" : "check-circle-fill.pdf",
5-
"idiom" : "universal",
6-
"scale" : "1x"
7-
},
8-
{
9-
"idiom" : "universal",
10-
"scale" : "2x"
11-
},
12-
{
13-
"idiom" : "universal",
14-
"scale" : "3x"
5+
"idiom" : "universal"
156
}
167
],
178
"info" : {

‎pullBar/Assets.xcassets/check-circle.imageset/Contents.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22
"images" : [
33
{
44
"filename" : "check-circle.pdf",
5-
"idiom" : "universal",
6-
"scale" : "1x"
7-
},
8-
{
9-
"idiom" : "universal",
10-
"scale" : "2x"
11-
},
12-
{
13-
"idiom" : "universal",
14-
"scale" : "3x"
5+
"idiom" : "universal"
156
}
167
],
178
"info" : {

0 commit comments

Comments
 (0)