Skip to content

Commit

Permalink
Merge branch 'release/0.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mangerlahn committed Apr 20, 2018
2 parents ecef6bc + 36abfbd commit 6ff757d
Show file tree
Hide file tree
Showing 25 changed files with 115 additions and 44 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ fastlane/test_output

iOSInjectionProject/
*.xcbkptlist
/Frameworks/Cartfile.resolved
Frameworks/Carthage/Checkouts
1 change: 1 addition & 0 deletions Frameworks/Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "sparkle-project/Sparkle"
69 changes: 62 additions & 7 deletions Latest.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
50290E751E53EB6A00133E3D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50290E741E53EB6A00133E3D /* AppDelegate.swift */; };
50290E791E53EB6A00133E3D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50290E781E53EB6A00133E3D /* Assets.xcassets */; };
50290E7C1E53EB6A00133E3D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50290E7A1E53EB6A00133E3D /* Main.storyboard */; };
5045842C1FF6CF0F00E15E9D /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5045842B1FF6CF0F00E15E9D /* Sparkle.framework */; };
5045842D1FF6CF0F00E15E9D /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5045842B1FF6CF0F00E15E9D /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
504584301FF6CF4F00E15E9D /* Sparkle.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5045842F1FF6CF4F00E15E9D /* Sparkle.framework.dSYM */; };
5058B34B1FFBC34C007C6903 /* FolderUpdateListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5058B34A1FFBC34C007C6903 /* FolderUpdateListener.swift */; };
509512141FF362A1003D2D7F /* Version.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509512101FF362A1003D2D7F /* Version.swift */; };
509512151FF362A1003D2D7F /* UpdateInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509512111FF362A1003D2D7F /* UpdateInfo.swift */; };
Expand All @@ -27,6 +30,7 @@
509512341FF36380003D2D7F /* UpdateListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509512321FF36380003D2D7F /* UpdateListViewController.swift */; };
509512361FF36388003D2D7F /* MainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 509512351FF36388003D2D7F /* MainWindowController.swift */; };
50C81D741FBADC9100324C2E /* VersionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50C81D731FBADC9100324C2E /* VersionTest.swift */; };
50C8C85C208A0EE9004FF5D5 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 50C8C85B208A0EE9004FF5D5 /* dsa_pub.pem */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -39,6 +43,30 @@
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
5045842E1FF6CF2D00E15E9D /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 16;
files = (
504584301FF6CF4F00E15E9D /* Sparkle.framework.dSYM in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5046AFF11FF6CEBD00ABAA97 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
5045842D1FF6CF0F00E15E9D /* Sparkle.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
501EA97F1EB1BA4400D05821 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
501EA9831EB1BA4400D05821 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand All @@ -51,6 +79,8 @@
50290E7B1E53EB6A00133E3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
50290E7D1E53EB6A00133E3D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50290E831E53EB7900133E3D /* Latest.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Latest.entitlements; sourceTree = "<group>"; };
5045842B1FF6CF0F00E15E9D /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Carthage/Build/Mac/Sparkle.framework; sourceTree = "<group>"; };
5045842F1FF6CF4F00E15E9D /* Sparkle.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Sparkle.framework.dSYM; path = Frameworks/Carthage/Build/Mac/Sparkle.framework.dSYM; sourceTree = "<group>"; };
5058B34A1FFBC34C007C6903 /* FolderUpdateListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderUpdateListener.swift; sourceTree = "<group>"; };
509512101FF362A1003D2D7F /* Version.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Version.swift; sourceTree = "<group>"; };
509512111FF362A1003D2D7F /* UpdateInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdateInfo.swift; sourceTree = "<group>"; };
Expand All @@ -67,13 +97,15 @@
50C81D691FBADC5900324C2E /* Latest Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Latest Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
50C81D6D1FBADC5900324C2E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50C81D731FBADC9100324C2E /* VersionTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionTest.swift; sourceTree = "<group>"; };
50C8C85B208A0EE9004FF5D5 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
50290E6E1E53EB6A00133E3D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5045842C1FF6CF0F00E15E9D /* Sparkle.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -92,6 +124,7 @@
children = (
50290E731E53EB6A00133E3D /* Latest */,
50C81D6A1FBADC5900324C2E /* Tests */,
5046AFF21FF6CECD00ABAA97 /* Frameworks */,
50290E721E53EB6A00133E3D /* Products */,
);
sourceTree = "<group>";
Expand All @@ -112,12 +145,21 @@
5095122A1FF36326003D2D7F /* Visuals */,
5095120D1FF3626A003D2D7F /* Model */,
50290E7A1E53EB6A00133E3D /* Main.storyboard */,
5095120C1FF3623B003D2D7F /* Other */,
5095120C1FF3623B003D2D7F /* Resources */,
);
path = Latest;
sourceTree = "<group>";
};
5095120C1FF3623B003D2D7F /* Other */ = {
5046AFF21FF6CECD00ABAA97 /* Frameworks */ = {
isa = PBXGroup;
children = (
5045842F1FF6CF4F00E15E9D /* Sparkle.framework.dSYM */,
5045842B1FF6CF0F00E15E9D /* Sparkle.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
5095120C1FF3623B003D2D7F /* Resources */ = {
isa = PBXGroup;
children = (
50290E831E53EB7900133E3D /* Latest.entitlements */,
Expand All @@ -126,8 +168,9 @@
501EA9891EB1BA4500D05821 /* InfoPlist.strings */,
501EA98C1EB1BD8B00D05821 /* Localizable.stringsdict */,
501EA9841EB1BA4400D05821 /* Localizable.strings */,
50C8C85B208A0EE9004FF5D5 /* dsa_pub.pem */,
);
path = Other;
path = Resources;
sourceTree = "<group>";
};
5095120D1FF3626A003D2D7F /* Model */ = {
Expand Down Expand Up @@ -216,6 +259,8 @@
50290E6D1E53EB6A00133E3D /* Sources */,
50290E6E1E53EB6A00133E3D /* Frameworks */,
50290E6F1E53EB6A00133E3D /* Resources */,
5046AFF11FF6CEBD00ABAA97 /* Embed Frameworks */,
5045842E1FF6CF2D00E15E9D /* CopyFiles */,
);
buildRules = (
);
Expand Down Expand Up @@ -281,6 +326,7 @@
knownRegions = (
en,
Base,
de,
);
mainGroup = 50290E681E53EB6A00133E3D;
productRefGroup = 50290E721E53EB6A00133E3D /* Products */;
Expand All @@ -299,6 +345,7 @@
buildActionMask = 2147483647;
files = (
50290E791E53EB6A00133E3D /* Assets.xcassets in Resources */,
50C8C85C208A0EE9004FF5D5 /* dsa_pub.pem in Resources */,
501EA9821EB1BA4400D05821 /* Localizable.strings in Resources */,
50290E7C1E53EB6A00133E3D /* Main.storyboard in Resources */,
501EA98A1EB1BD8B00D05821 /* Localizable.stringsdict in Resources */,
Expand Down Expand Up @@ -508,10 +555,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = Latest/Other/Latest.entitlements;
CODE_SIGN_ENTITLEMENTS = Latest/Resources/Latest.entitlements;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = VFABJ5RE5Q;
INFOPLIST_FILE = "$(SRCROOT)/Latest/Other/Info.plist";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks/Carthage/Build/Mac",
);
INFOPLIST_FILE = "$(SRCROOT)/Latest/Resources/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.max-langer.Latest";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -525,10 +576,14 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_ENTITLEMENTS = Latest/Other/Latest.entitlements;
CODE_SIGN_ENTITLEMENTS = Latest/Resources/Latest.entitlements;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = VFABJ5RE5Q;
INFOPLIST_FILE = "$(SRCROOT)/Latest/Other/Info.plist";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks/Carthage/Build/Mac",
);
INFOPLIST_FILE = "$(SRCROOT)/Latest/Resources/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.max-langer.Latest";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
7 changes: 7 additions & 0 deletions Latest/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
</connections>
</menuItem>
<menuItem title="Check for Updates…" id="4vf-ia-dzo">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="checkForUpdates:" target="ZIQ-oE-e1U" id="wrG-jU-gAV"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
Expand Down Expand Up @@ -157,6 +163,7 @@
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Latest" customModuleProvider="target"/>
<customObject id="ZIQ-oE-e1U" customClass="SUUpdater"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="76" y="-68"/>
Expand Down
12 changes: 0 additions & 12 deletions Latest/Other/Latest.entitlements

This file was deleted.

22 changes: 0 additions & 22 deletions Latest/Other/de.lproj/Localizable.stringsdict

This file was deleted.

10 changes: 8 additions & 2 deletions Latest/Other/Info.plist → Latest/Resources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.3</string>
<string>0.3.1</string>
<key>CFBundleVersion</key>
<string>3</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSAppTransportSecurity</key>
Expand All @@ -28,10 +30,14 @@
<true/>
</dict>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2017 Max Langer. All rights reserved.</string>
<string>Copyright © 2018 Max Langer. All rights reserved.</string>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>SUFeedURL</key>
<string>https://max.codes/latest/feed.xml</string>
<key>SUPublicDSAKeyFile</key>
<string>dsa_pub.pem</string>
</dict>
</plist>
5 changes: 5 additions & 0 deletions Latest/Resources/Latest.entitlements
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?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/>
</plist>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2017 Max Langer. All rights reserved.";

File renamed without changes.
11 changes: 11 additions & 0 deletions Latest/Resources/de.lproj/Localizable.stringsdict
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"number_of_updates_available" = {
NSStringLocalizedFormatKey = "%#@value@";
value = {
NSStringFormatSpecTypeKey = NSStringPluralRuleType;
NSStringFormatValueTypeKey = d;
one = "%d Update verf\U00fcgbar";
other = "%d Updates verf\U00fcgbar";
};
};
}
12 changes: 12 additions & 0 deletions Latest/Resources/dsa_pub.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
-----BEGIN PUBLIC KEY-----
MIIBzjCCATsGByqGSM44BAEwggEuAoGJAJUuzuW6rEfh9zRfRqmkfbBdNvF4YZLj
462PpA7/GzrnvCFRA0oQShRrMk1zwfxS1LTq09/3eS91U4em4JDmOvVre5izlcJx
FLabhhbCpGiLyIqX7zitFPgxEX2CxhtoyO3gtw80xNmPN8eftEdCaQjSv0PcH0I0
OD78lZPFVdZacpLm2FRobAECFQCEWutLEKXbmzssr2YEFN2UXq4KmQKBiGaY5WiJ
WvetjR4VbwF+aeLvu7vNSIbDmWdsFW4iNHl6h9U6qOGNqXz+6JRRJ85oyHfSLrxz
wgFq3J5pNXkOBQW7OyOx4v5PAkdOw+O8MlOuK5xUxc5rViqV2H39RrhUH8FMa3nN
qA7bjayi77O8Jd0ayCHplbkZzpiREi3zaOIqdfzEYVQO8gUDgYwAAoGIS1SVbDrt
EwqUuPhTuq/92MCLx8zpd8yktfwYPHo+WwPW6fd7/YSZrdMKPcNtitd7Zgey5cRa
qqHznmgvUSdgy2/m/rASKgBAiPD+98wFCVVhmC0ooriGkx254i9SucEwXffB3BaP
kfD9LMgocKqla5I9aKWGkNoZ/EoguP89522VhvltDLog7A==
-----END PUBLIC KEY-----
6 changes: 6 additions & 0 deletions Latest/de.lproj/Main.strings
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
/* Class = "NSMenuItem"; title = "Quit Latest"; ObjectID = "4sb-4s-VLi"; */
"4sb-4s-VLi.title" = "Latest beenden";

/* Class = "NSMenuItem"; title = "Check for Updates…"; ObjectID = "4vf-ia-dzo"; */
"4vf-ia-dzo.title" = "Auf Aktualisierungen prüfen… ";

/* Class = "NSMenuItem"; title = "About Latest"; ObjectID = "5kV-Vb-QxS"; */
"5kV-Vb-QxS.title" = "Über Latest";

Expand Down Expand Up @@ -112,6 +115,9 @@
/* Class = "NSMenuItem"; title = "File"; ObjectID = "dMs-cI-mzQ"; */
"dMs-cI-mzQ.title" = "Ablage";

/* Class = "NSBox"; title = "Box"; ObjectID = "fTN-EX-6Vz"; */
"fTN-EX-6Vz.title" = "Box";

/* Class = "NSTextFieldCell"; title = "Current Version"; ObjectID = "h6g-FG-nGh"; */
"h6g-FG-nGh.title" = "Installierte Version";

Expand Down

0 comments on commit 6ff757d

Please sign in to comment.