Skip to content

Commit 364f44b

Browse files
phucledienphucledien
authored
Merge pull request #72 from dwarvesf/develop
Release v1.4
2 parents c8c3195 + 207a89d commit 364f44b

28 files changed

+1244
-468
lines changed

‎Hidden Bar.xcodeproj/project.pbxproj

+26-11
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
08A5F85F23AA01EE00981CA5 /* HotKey in Frameworks */ = {isa = PBXBuildFile; productRef = 08A5F85E23AA01EE00981CA5 /* HotKey */; };
1414
08A5F86123AA085B00981CA5 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A5F86023AA085B00981CA5 /* Preferences.swift */; };
1515
08A5F86423AA09F300981CA5 /* UserDefault+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A5F86323AA09F300981CA5 /* UserDefault+Extension.swift */; };
16+
08B9F32C2411883300AA0551 /* NSWindow+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08B9F32B2411883300AA0551 /* NSWindow+Extension.swift */; };
1617
08C20FDE23AABDD10035D978 /* HyperlinkTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08C20FDD23AABDD10035D978 /* HyperlinkTextField.swift */; };
1718
08C20FE023AB44E60035D978 /* Bundle+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08C20FDF23AB44E60035D978 /* Bundle+Extension.swift */; };
1819
08C20FE223AB452C0035D978 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08C20FE123AB452C0035D978 /* AboutViewController.swift */; };
@@ -55,6 +56,7 @@
5556
08A5F85B23AA013100981CA5 /* SelectedSecond.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectedSecond.swift; sourceTree = "<group>"; };
5657
08A5F86023AA085B00981CA5 /* Preferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = "<group>"; };
5758
08A5F86323AA09F300981CA5 /* UserDefault+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefault+Extension.swift"; sourceTree = "<group>"; };
59+
08B9F32B2411883300AA0551 /* NSWindow+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSWindow+Extension.swift"; sourceTree = "<group>"; };
5860
08C20FDD23AABDD10035D978 /* HyperlinkTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HyperlinkTextField.swift; sourceTree = "<group>"; };
5961
08C20FDF23AB44E60035D978 /* Bundle+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Extension.swift"; sourceTree = "<group>"; };
6062
08C20FE123AB452C0035D978 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
@@ -80,6 +82,8 @@
8082
92C97B8E220147FE0007559C /* Constant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constant.swift; sourceTree = "<group>"; };
8183
92C97B9022018C1F0007559C /* StatusBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBarController.swift; sourceTree = "<group>"; };
8284
B350A2CC23AAFB47003A04AC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
85+
B8404C9A24041A4300E6DBF8 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Main.strings; sourceTree = "<group>"; };
86+
B8404C9B24041A4300E6DBF8 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Main.strings; sourceTree = "<group>"; };
8387
/* End PBXFileReference section */
8488

8589
/* Begin PBXFrameworksBuildPhase section */
@@ -144,6 +148,7 @@
144148
children = (
145149
08A5F86323AA09F300981CA5 /* UserDefault+Extension.swift */,
146150
08C20FDF23AB44E60035D978 /* Bundle+Extension.swift */,
151+
08B9F32B2411883300AA0551 /* NSWindow+Extension.swift */,
147152
);
148153
path = Extensions;
149154
sourceTree = "<group>";
@@ -282,11 +287,12 @@
282287
isa = PBXProject;
283288
attributes = {
284289
LastSwiftUpdateCheck = 1010;
285-
LastUpgradeCheck = 1010;
290+
LastUpgradeCheck = 1130;
286291
ORGANIZATIONNAME = "Dwarves Foundation";
287292
TargetAttributes = {
288293
929113F021F9D04100173149 = {
289294
CreatedOnToolsVersion = 10.1;
295+
LastSwiftMigration = 1130;
290296
SystemCapabilities = {
291297
com.apple.Sandbox = {
292298
enabled = 1;
@@ -295,6 +301,7 @@
295301
};
296302
92C5054D21FEC03B0084719A = {
297303
CreatedOnToolsVersion = 10.1;
304+
LastSwiftMigration = 1130;
298305
};
299306
};
300307
};
@@ -306,6 +313,7 @@
306313
en,
307314
Base,
308315
"zh-Hans",
316+
ja,
309317
);
310318
mainGroup = 929113E821F9D04100173149;
311319
packageReferences = (
@@ -353,6 +361,7 @@
353361
08A5F86123AA085B00981CA5 /* Preferences.swift in Sources */,
354362
92C97B9122018C1F0007559C /* StatusBarController.swift in Sources */,
355363
92D2122221FEE06600C92FF4 /* LauncherApplication.app in Sources */,
364+
08B9F32C2411883300AA0551 /* NSWindow+Extension.swift in Sources */,
356365
929113F521F9D04100173149 /* AppDelegate.swift in Sources */,
357366
08C20FDE23AABDD10035D978 /* HyperlinkTextField.swift in Sources */,
358367
92C97B88220032ED0007559C /* Util.swift in Sources */,
@@ -383,6 +392,7 @@
383392
children = (
384393
929113FB21F9D04200173149 /* Base */,
385394
B350A2CC23AAFB47003A04AC /* zh-Hans */,
395+
B8404C9A24041A4300E6DBF8 /* ja */,
386396
);
387397
name = Main.storyboard;
388398
sourceTree = "<group>";
@@ -391,6 +401,7 @@
391401
isa = PBXVariantGroup;
392402
children = (
393403
92C5055721FEC03C0084719A /* Base */,
404+
B8404C9B24041A4300E6DBF8 /* ja */,
394405
);
395406
name = Main.storyboard;
396407
sourceTree = "<group>";
@@ -524,17 +535,18 @@
524535
CODE_SIGN_STYLE = Automatic;
525536
COMBINE_HIDPI_IMAGES = YES;
526537
DEVELOPMENT_TEAM = W777S7V8TN;
538+
ENABLE_HARDENED_RUNTIME = YES;
527539
INFOPLIST_FILE = hidden/Info.plist;
528540
LD_RUNPATH_SEARCH_PATHS = (
529541
"$(inherited)",
530542
"@executable_path/../Frameworks",
531543
);
532-
MACOSX_DEPLOYMENT_TARGET = 10.13;
533-
MARKETING_VERSION = 1.3;
544+
MACOSX_DEPLOYMENT_TARGET = 10.12;
545+
MARKETING_VERSION = 1.4;
534546
PRODUCT_BUNDLE_IDENTIFIER = com.dwarvesv.minimalbar;
535547
PRODUCT_NAME = "$(TARGET_NAME)";
536548
PROVISIONING_PROFILE_SPECIFIER = "";
537-
SWIFT_VERSION = 4.2;
549+
SWIFT_VERSION = 5.0;
538550
};
539551
name = Debug;
540552
};
@@ -547,17 +559,18 @@
547559
CODE_SIGN_STYLE = Automatic;
548560
COMBINE_HIDPI_IMAGES = YES;
549561
DEVELOPMENT_TEAM = W777S7V8TN;
562+
ENABLE_HARDENED_RUNTIME = YES;
550563
INFOPLIST_FILE = hidden/Info.plist;
551564
LD_RUNPATH_SEARCH_PATHS = (
552565
"$(inherited)",
553566
"@executable_path/../Frameworks",
554567
);
555-
MACOSX_DEPLOYMENT_TARGET = 10.13;
556-
MARKETING_VERSION = 1.3;
568+
MACOSX_DEPLOYMENT_TARGET = 10.12;
569+
MARKETING_VERSION = 1.4;
557570
PRODUCT_BUNDLE_IDENTIFIER = com.dwarvesv.minimalbar;
558571
PRODUCT_NAME = "$(TARGET_NAME)";
559572
PROVISIONING_PROFILE_SPECIFIER = "";
560-
SWIFT_VERSION = 4.2;
573+
SWIFT_VERSION = 5.0;
561574
};
562575
name = Release;
563576
};
@@ -570,17 +583,18 @@
570583
CODE_SIGN_STYLE = Automatic;
571584
COMBINE_HIDPI_IMAGES = YES;
572585
DEVELOPMENT_TEAM = W777S7V8TN;
586+
ENABLE_HARDENED_RUNTIME = YES;
573587
INFOPLIST_FILE = LauncherApplication/Info.plist;
574588
LD_RUNPATH_SEARCH_PATHS = (
575589
"$(inherited)",
576590
"@executable_path/../Frameworks",
577591
);
578-
MACOSX_DEPLOYMENT_TARGET = 10.13;
592+
MACOSX_DEPLOYMENT_TARGET = 10.12;
579593
PRODUCT_BUNDLE_IDENTIFIER = com.dwarvesv.LauncherApplication;
580594
PRODUCT_NAME = "$(TARGET_NAME)";
581595
PROVISIONING_PROFILE_SPECIFIER = "";
582596
SKIP_INSTALL = YES;
583-
SWIFT_VERSION = 4.2;
597+
SWIFT_VERSION = 5.0;
584598
};
585599
name = Debug;
586600
};
@@ -593,17 +607,18 @@
593607
CODE_SIGN_STYLE = Automatic;
594608
COMBINE_HIDPI_IMAGES = YES;
595609
DEVELOPMENT_TEAM = W777S7V8TN;
610+
ENABLE_HARDENED_RUNTIME = YES;
596611
INFOPLIST_FILE = LauncherApplication/Info.plist;
597612
LD_RUNPATH_SEARCH_PATHS = (
598613
"$(inherited)",
599614
"@executable_path/../Frameworks",
600615
);
601-
MACOSX_DEPLOYMENT_TARGET = 10.13;
616+
MACOSX_DEPLOYMENT_TARGET = 10.12;
602617
PRODUCT_BUNDLE_IDENTIFIER = com.dwarvesv.LauncherApplication;
603618
PRODUCT_NAME = "$(TARGET_NAME)";
604619
PROVISIONING_PROFILE_SPECIFIER = "";
605620
SKIP_INSTALL = YES;
606-
SWIFT_VERSION = 4.2;
621+
SWIFT_VERSION = 5.0;
607622
};
608623
name = Release;
609624
};

‎Hidden Bar.xcodeproj/xcshareddata/xcschemes/Hidden Bar.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Hidden Bar.xcodeproj/xcshareddata/xcschemes/LauncherApplication.xcscheme

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1130"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "92C5054D21FEC03B0084719A"
34+
BuildableName = "LauncherApplication.app"
35+
BlueprintName = "LauncherApplication"
36+
ReferencedContainer = "container:Hidden Bar.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "92C5054D21FEC03B0084719A"
56-
BuildableName = "LauncherApplication.app"
57-
BlueprintName = "LauncherApplication"
58-
ReferencedContainer = "container:Hidden Bar.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Release"
@@ -81,8 +79,6 @@
8179
ReferencedContainer = "container:Hidden Bar.xcodeproj">
8280
</BuildableReference>
8381
</BuildableProductRunnable>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8682
</LaunchAction>
8783
<ProfileAction
8884
buildConfiguration = "Release"

0 commit comments

Comments
 (0)