Merge pull request #44 from Yoi-Nami-Ra/1.8.0/release

Version 1.8.0 rc1
coddingtonbear · Aug 18, 2018 · 143a14b · 143a14b
2 parents 3fa3f6e + c1ebe8b
commit 143a14b
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 16 deletions.
diff --git a/Taskwarrior Pomodoro.xcodeproj/project.pbxproj b/Taskwarrior Pomodoro.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 48;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -20,6 +20,8 @@
 		4C879AE91C13BDF8000C3F84 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		4C879AEB1C13BDF8000C3F84 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4C879AF31C13CD00000C3F84 /* SwiftyJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftyJSON.swift; sourceTree = "<group>"; };
+		F3E3A6D021286EE300E7A428 /* changelog.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = changelog.md; sourceTree = "<group>"; };
+		F3E3A6D121286EE300E7A428 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = readme.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -36,6 +38,7 @@
 		4C879AD81C13BDF8000C3F84 = {
 			isa = PBXGroup;
 			children = (
+				F3E3A6D321286F2600E7A428 /* docs */,
 				4C879AE31C13BDF8000C3F84 /* Taskwarrior Pomodoro */,
 				4C879AE21C13BDF8000C3F84 /* Products */,
 				4C879AF31C13CD00000C3F84 /* SwiftyJSON.swift */,
@@ -61,6 +64,15 @@
 			path = "Taskwarrior Pomodoro";
 			sourceTree = "<group>";
 		};
+		F3E3A6D321286F2600E7A428 /* docs */ = {
+			isa = PBXGroup;
+			children = (
+				F3E3A6D121286EE300E7A428 /* readme.md */,
+				F3E3A6D021286EE300E7A428 /* changelog.md */,
+			);
+			name = docs;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -94,11 +106,12 @@
 					4C879AE01C13BDF8000C3F84 = {
 						CreatedOnToolsVersion = 7.1.1;
 						LastSwiftMigration = 0830;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 4C879ADC1C13BDF8000C3F84 /* Build configuration list for PBXProject "Taskwarrior Pomodoro" */;
-			compatibilityVersion = "Xcode 8.0";
+			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -257,24 +270,36 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = "Taskwarrior Pomodoro/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "am.inthe.Taskwarrior-Pomodoro";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Debug;
 		};
 		4C879AF01C13BDF8000C3F84 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = "Taskwarrior Pomodoro/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/../Frameworks",
+				);
 				OTHER_SWIFT_FLAGS = "-DRELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = "am.inthe.Taskwarrior-Pomodoro";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Release;
 		};

diff --git a/Taskwarrior Pomodoro/Info.plist b/Taskwarrior Pomodoro/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.0</string>
+	<string>1.8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/createArchive.sh b/createArchive.sh
@@ -1,13 +1,22 @@
+appName='Taskwarrior Pomodoro'
+archivesFolder='~/Library/Developer/Xcode/Archives'
+todayArchives="$archivesFolder/$(date +%Y-%m-%d)"
+appArchivePath="$todayArchives/$appName $(date +%Y-%m-%d,\ %H.%M).xcarchive"
+packageName="taskwarrior-pomodoro"
+tempPackagePath="builds/distribute/$packageName.dmg"
 version=$(defaults read "$PWD/Taskwarrior Pomodoro/Info.plist" CFBundleShortVersionString)
-xcodebuild -scheme "Taskwarrior Pomodoro" -archivePath "builds/Taskwarrior Pomodoro.xcarchive" archive
-xcrun xcodebuild -exportArchive -exportOptionsPlist exportOptions.plist -archivePath "builds/Taskwarrior Pomodoro.xcarchive" -exportPath "builds/"
 
-hdiutil create -size 8m -fs HFS+ -volname "Taskwarrior Pomodoro" taskwarrior-pomodoro.dmg
-hdiutil attach taskwarrior-pomodoro.dmg
+xcodebuild -scheme "$appName" -archivePath "$appArchivePath" archive
+xcrun xcodebuild -exportArchive -exportOptionsPlist exportOptions.plist -archivePath "$appArchivePath" -exportPath "builds/distribute"
 
-ln -s /Applications /Volumes/Taskwarrior\ Pomodoro/
-cp -rf builds/Taskwarrior\ Pomodoro.app /Volumes/Taskwarrior\ Pomodoro/
+hdiutil create -size 12m -fs HFS+ -volname "$appName" $tempPackagePath
+hdiutil attach $tempPackagePath
 
-hdiutil detach /Volumes/Taskwarrior\ Pomodoro
-hdiutil convert taskwarrior-pomodoro.dmg -format UDZO -o taskwarrior-pomodoro-$version.dmg
-rm taskwarrior-pomodoro.dmg
+ln -s /Applications "/Volumes/$appName/"
+cp -rf "builds/distribute/$appName.app" "/Volumes/$appName/"
+
+hdiutil detach "/Volumes/$appName"
+hdiutil convert $tempPackagePath -format UDZO -o "builds/distribute/$packageName-$version.dmg"
+codesign -s "Mac Developer: yoi-nami-ra" "builds/distribute/$packageName-$version.dmg"
+
+rm $tempPackagePath
diff --git a/exportOptions.plist b/exportOptions.plist
@@ -5,6 +5,6 @@
 	<key>teamId</key>
 	<string></string>
 	<key>method</key>
-	<string>developer-id</string>
+	<string>mac-application</string>
 </dict>
 </plist>
diff --git a/readme.md b/readme.md
@@ -6,7 +6,7 @@ A simple application allowing you to use Pomodoro techniques with Taskwarrior on
 
 ## Installation
 
-You can [download the latest release (1.7.0) here](http://coddingtonbear-public.s3.amazonaws.com/github/taskwarrior-pomodoro/releases/taskwarrior-pomodoro-1.7.0.dmg), and install it by dragging the application into your Applications directory.
+You can download the latest version [from the release page here](https://github.com/coddingtonbear/taskwarrior-pomodoro/releases), and install it by dragging the application into your Applications directory.
 
 ## Configuration