From 5cb4fe45ad8cd6a9c69c32f1721adf1d00bd0fa8 Mon Sep 17 00:00:00 2001
From: Aman Chhabra <17457975+achhabra2@users.noreply.github.com>
Date: Thu, 16 Dec 2021 11:08:21 -0800
Subject: [PATCH] Refactor build scripts

---
 .github/workflows/build.yaml                        | 2 +-
 sign.sh => build-macos.sh                           | 6 +++---
 build/darwin/Info.plist                             | 4 ++--
 gon-notarize.json => build/darwin/gon-notarize.json | 0
 gon-sign.json => build/darwin/gon-sign.json         | 0
 build/windows/RiftShare.exe.manifest                | 2 +-
 internal/update/selfupdate.go                       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename sign.sh => build-macos.sh (77%)
 rename gon-notarize.json => build/darwin/gon-notarize.json (100%)
 rename gon-sign.json => build/darwin/gon-sign.json (100%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 41928e7..7469048 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -44,7 +44,7 @@ jobs:
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
         run: |
-          ./sign.sh
+          ./build-macos.sh
         if: matrix.os == 'macos-11'
       # - name: Build package linux
       #   run: |
diff --git a/sign.sh b/build-macos.sh
similarity index 77%
rename from sign.sh
rename to build-macos.sh
index 62ad024..0bc45d2 100755
--- a/sign.sh
+++ b/build-macos.sh
@@ -2,7 +2,7 @@ export PATH=${PATH}:`go env GOPATH`/bin
 echo "building on AMD64"
 wails build -platform darwin/amd64 -clean
 echo "Signing Package"
-gon -log-level=info ./gon-sign.json
+gon -log-level=info ./build/darwin/gon-sign.json
 echo "Zipping Package"
 ditto -c -k --keepParent ./build/bin/RiftShare.app ./RiftShare-darwin-amd64.zip
 echo "Cleaning up"
@@ -10,10 +10,10 @@ rm -rf ./build/bin/RiftShare.app
 echo "building on ARM64"
 wails build -platform darwin/arm64 -clean
 echo "Signing Package"
-gon -log-level=info -log-json ./gon-sign.json
+gon -log-level=info -log-json ./build/darwin/gon-sign.json
 echo "Zipping Package"
 ditto -c -k --keepParent ./build/bin/RiftShare.app ./RiftShare-darwin-arm64.zip
 echo "Cleaning up"
 rm -rf ./build/bin/RiftShare.app
 echo "Notarizing Zip Files"
-gon -log-level=info ./gon-notarize.json
\ No newline at end of file
+gon -log-level=info ./build/darwin/gon-notarize.json
\ No newline at end of file
diff --git a/build/darwin/Info.plist b/build/darwin/Info.plist
index e4b31d1..f89605d 100644
--- a/build/darwin/Info.plist
+++ b/build/darwin/Info.plist
@@ -6,9 +6,9 @@
 	<key>CFBundleName</key><string>RiftShare</string>
 	<key>CFBundleExecutable</key><string>RiftShare</string>
 	<key>CFBundleIdentifier</key><string>app.riftshare</string>
-	<key>CFBundleVersion</key><string>0.0.8</string>
+	<key>CFBundleVersion</key><string>0.1.0</string>
 	<key>CFBundleGetInfoString</key><string>Riftshare - Easy, Secure, Free file sharing</string>
-	<key>CFBundleShortVersionString</key><string>0.0.8</string>
+	<key>CFBundleShortVersionString</key><string>0.1.0</string>
 	<key>CFBundleIconFile</key><string>iconfile.icns</string>
 	<key>LSMinimumSystemVersion</key><string>10.13.0</string>
 	<key>NSHighResolutionCapable</key><string>true</string>
diff --git a/gon-notarize.json b/build/darwin/gon-notarize.json
similarity index 100%
rename from gon-notarize.json
rename to build/darwin/gon-notarize.json
diff --git a/gon-sign.json b/build/darwin/gon-sign.json
similarity index 100%
rename from gon-sign.json
rename to build/darwin/gon-sign.json
diff --git a/build/windows/RiftShare.exe.manifest b/build/windows/RiftShare.exe.manifest
index 99c2a20..3c8c218 100644
--- a/build/windows/RiftShare.exe.manifest
+++ b/build/windows/RiftShare.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" name="RiftShare" version="0.0.8.0" processorArchitecture="amd64"/>
+    <assemblyIdentity type="win32" name="app.riftshare" version="0.1.0.0" processorArchitecture="amd64"/>
     <dependency>
         <dependentAssembly>
             <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
diff --git a/internal/update/selfupdate.go b/internal/update/selfupdate.go
index a06ee8e..22f6561 100644
--- a/internal/update/selfupdate.go
+++ b/internal/update/selfupdate.go
@@ -7,7 +7,7 @@ import (
 	"github.com/rhysd/go-github-selfupdate/selfupdate"
 )
 
-const Version = "0.0.8"
+const Version = "0.1.0"
 
 func DoSelfUpdate() bool {
 	v := semver.MustParse(Version)