From 697c1b03d0a1c81588eb9ecbbdf999d9ad19cd00 Mon Sep 17 00:00:00 2001 From: Yoi-Nami-Ra Date: Sat, 18 Aug 2018 19:56:45 +0200 Subject: [PATCH 1/3] Bump project version to 1.8.0 and update code sign settings --- .../project.pbxproj | 21 +++++++++++++++---- Taskwarrior Pomodoro/Info.plist | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Taskwarrior Pomodoro.xcodeproj/project.pbxproj b/Taskwarrior Pomodoro.xcodeproj/project.pbxproj index f9232c0..be13893 100644 --- 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 */ @@ -94,11 +94,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,11 +258,17 @@ 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; }; @@ -269,12 +276,18 @@ 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 index 4210b93..f691975 100644 --- a/Taskwarrior Pomodoro/Info.plist +++ b/Taskwarrior Pomodoro/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.7.0 + 1.8.0 CFBundleSignature ???? CFBundleVersion From a5ab934820ec31f97bf8c28668143bf2f19292fb Mon Sep 17 00:00:00 2001 From: Yoi-Nami-Ra Date: Sat, 18 Aug 2018 20:34:47 +0200 Subject: [PATCH 2/3] Updated package creation script --- createArchive.sh | 27 ++++++++++++++++++--------- exportOptions.plist | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/createArchive.sh b/createArchive.sh index 88e6677..9495d42 100755 --- 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 index a2ce007..dd0a54b 100644 --- a/exportOptions.plist +++ b/exportOptions.plist @@ -5,6 +5,6 @@ teamId method - developer-id + mac-application From c1ebe8b2e7e50ea3f5981135837aade184d662ab Mon Sep 17 00:00:00 2001 From: Yoi-Nami-Ra Date: Sat, 18 Aug 2018 21:07:36 +0200 Subject: [PATCH 3/3] Updated readme file and brought it into the project --- Taskwarrior Pomodoro.xcodeproj/project.pbxproj | 12 ++++++++++++ readme.md | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Taskwarrior Pomodoro.xcodeproj/project.pbxproj b/Taskwarrior Pomodoro.xcodeproj/project.pbxproj index be13893..af4f4a9 100644 --- a/Taskwarrior Pomodoro.xcodeproj/project.pbxproj +++ b/Taskwarrior Pomodoro.xcodeproj/project.pbxproj @@ -20,6 +20,8 @@ 4C879AE91C13BDF8000C3F84 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 4C879AEB1C13BDF8000C3F84 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4C879AF31C13CD00000C3F84 /* SwiftyJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftyJSON.swift; sourceTree = ""; }; + F3E3A6D021286EE300E7A428 /* changelog.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = changelog.md; sourceTree = ""; }; + F3E3A6D121286EE300E7A428 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = readme.md; sourceTree = ""; }; /* 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 = ""; }; + F3E3A6D321286F2600E7A428 /* docs */ = { + isa = PBXGroup; + children = ( + F3E3A6D121286EE300E7A428 /* readme.md */, + F3E3A6D021286EE300E7A428 /* changelog.md */, + ); + name = docs; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ diff --git a/readme.md b/readme.md index ae3e0ad..abe3e20 100644 --- 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