From b06b87833522b275741fd35a8ee5eb99b03c5a81 Mon Sep 17 00:00:00 2001
From: Serhiy Mytrovtsiy <mitrovtsiy@ukr.net>
Date: Thu, 4 Jul 2019 20:53:18 +0200
Subject: [PATCH] Makefile update

---
 Makefile                          | 58 ++++++++++++++++---------------
 Stats/Supporting Files/Info.plist |  2 +-
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index b1f0b2ea..56d0804f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,48 @@
 APP = Stats
-ITC_USERNAME = AC_USERNAME
-ITC_PASSWORD = @keychain:AC_PASSWORD
-ITC_PROVIDER= AC_PROVIDER
-
 BUNDLE_ID = eu.exelban.Stats
 
-BUILD_PATH = ${PWD}/build
+ITC_USERNAME = $(AC_USERNAME)
+ITC_PASSWORD = @keychain:AC_PASSWORD
+ITC_PROVIDER = $(AC_PROVIDER)
+
+RequestUUID = e6c7b954-d9fa-4c74-8927-ba2172c9526e
+
+BUILD_PATH = $(PWD)/build
 ARCHIVE_PATH = $(BUILD_PATH)/$(APP).xcarchive
-APP_PATH = "${BUILD_PATH}/${APP}.app"
-ZIP_PATH = "${BUILD_PATH}/${APP}.zip"
+APP_PATH = "$(BUILD_PATH)/$(APP).app"
+ZIP_PATH = "$(BUILD_PATH)/$(APP).zip"
 DMG_PATH = $(PWD)/$(APP).dmg
 
 all: clean archive notarize sign build clean
 
 clean:
-	rm -rf ${BUILD_PATH}
+	rm -rf $(BUILD_PATH)
 
 .PHONY: archive
 archive: clean
 	xcodebuild \
-  		-scheme ${APP} \
+  		-scheme $(APP) \
   		-destination 'platform=OS X,arch=x86_64' \
   		-configuration AppStoreDistribution archive \
-  		-archivePath ${ARCHIVE_PATH}
+  		-archivePath $(ARCHIVE_PATH)
 
 	xcodebuild \
   		-exportArchive \
-  		-exportOptionsPlist "${PWD}/exportOptions.plist" \
-  		-archivePath ${ARCHIVE_PATH} \
-  		-exportPath ${BUILD_PATH}
+  		-exportOptionsPlist "$(PWD)/exportOptions.plist" \
+  		-archivePath $(ARCHIVE_PATH) \
+  		-exportPath $(BUILD_PATH)
 
-	ditto -c -k --keepParent ${APP_PATH} ${ZIP_PATH}
+	ditto -c -k --keepParent $(APP_PATH) $(ZIP_PATH)
 
 .PHONY: notarize
-notarize: archive
+notarize:
 	xcrun altool \
 	  --notarize-app \
-	  --primary-bundle-id ${BUNDLE_ID} \
-	  -itc_provider ${ITC_PROVIDER} \
-	  -u ${ITC_USERNAME} \
-	  -p ${ITC_PASSWORD} \
-	  --file ${ZIP_PATH} 
+	  --primary-bundle-id $(BUNDLE_ID)\
+	  -itc_provider $(ITC_PROVIDER) \
+	  -u $(ITC_USERNAME) \
+	  -p $(ITC_PASSWORD) \
+	  --file $(ZIP_PATH) 
 
 	sleep 380
 
@@ -68,18 +70,18 @@ build: sign
 	    $(APP_PATH)
 
 	rm -rf ./create-dmg
-	rm -rf $(BUILD_PATH)
+	open $(PWD)
 
 check:
 	xcrun altool \
-	  --notarization-info 55fe58d9-d149-4f91-b448-ad8427b90055 \
-	  -itc_provider ${ITC_PROVIDER} \
-	  -u ${ITC_USERNAME} \
-	  -p ${ITC_PASSWORD}
+	  --notarization-info $(RequestUUID) \
+	  -itc_provider $(ITC_PROVIDER) \
+	  -u $(ITC_USERNAME) \
+	  -p $(ITC_PASSWORD)
 
 history:
 	xcrun altool \
 	  --notarization-history 0 \
-	  -itc_provider ${ITC_PROVIDER} \
-	  -u ${ITC_USERNAME} \
-	  -p ${ITC_PASSWORD}
\ No newline at end of file
+	  -itc_provider $(ITC_PROVIDER) \
+	  -u $(ITC_USERNAME) \
+	  -p $(ITC_PASSWORD)
\ No newline at end of file
diff --git a/Stats/Supporting Files/Info.plist b/Stats/Supporting Files/Info.plist
index 03d9fd58..03189f4c 100755
--- a/Stats/Supporting Files/Info.plist	
+++ b/Stats/Supporting Files/Info.plist	
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.2</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>7</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>