Remove GitHash usage and refactor code

Author: Kyle-Ye

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -40,8 +40,7 @@ body:
          click on the version number on the welcome screen
       value: |
         CodeEdit: [e.g. 1.0]
-        Hash: [e.g. 87a5b3f4c18238c0d06cbfce595e1ca9b11cfd8e]
-        MacOS: [e.g. 12.3.0]
+        macOS: [e.g. 12.3.0]
         Xcode: [e.g. 13.3]
     validations:
       required: true

CodeEdit.xcodeproj/project.pbxproj

@@ -648,7 +648,6 @@
 				B658FB2827DA9E0F00EA4DBD /* Sources */,
 				B658FB2927DA9E0F00EA4DBD /* Frameworks */,
 				B658FB2A27DA9E0F00EA4DBD /* Resources */,
-				2B1A76FC27F628BD008ED4A2 /* Update commit hash */,
 				2B18499A27F8A7A0005119F0 /* Mark // swiftlint:disable:all as errors | Run Script */,
 				2BA119D327E5274D00A996FF /* SwiftLint Run Script */,
 				04ADA0CC27E6043B00BF00B2 /* Add TODO/FIXME as warnings | Run Script */,
@@ -855,24 +854,6 @@
 			shellPath = /bin/sh;
 			shellScript = "TAGS=\"\\/\\/ swiftlint:disable all\"\necho \"searching ${SRCROOT} for ${TAGS}\"\nfind \"${SRCROOT}\" \\( -name \"*.swift\" \\) -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$\" | perl -p -e \"s/($TAGS)/ error: Usage of \\$1 is prohibited/\"\n";
 		};
-		2B1A76FC27F628BD008ED4A2 /* Update commit hash */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Update commit hash";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Hash (full length)\nGITHASH=$(git rev-parse HEAD)\n\necho \"${PROJECT_DIR}/${INFOPLIST_FILE}\"\necho $GITHASH\n# Set the hash.\n/usr/libexec/PlistBuddy -c \"Set :GitHash $GITHASH\" \"${PROJECT_DIR}/${INFOPLIST_FILE}\"\n";
-		};
 		2BA119D327E5274D00A996FF /* SwiftLint Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

CodeEdit/Info.plist

@@ -1239,8 +1239,6 @@
 			</array>
 		</dict>
 	</array>
-	<key>GitHash</key>
-	<string>92d4bf7f3ea8f1aa861dd6ad1c106f9e38ddd59a</string>
 	<key>SUEnableInstallerLauncherService</key>
 	<true/>
 	<key>SUFeedURL</key>

CodeEditCli/Sources/CodeEditCli/main.swift

@@ -25,7 +25,7 @@ func convertToAbsolutePath(_ path: String) -> String {
 
 func openApp(paths: [String]? = nil) {
     let task = Process()
-    task.launchPath = "/usr/bin/open" // This should be the same on all installations of MacOS
+    task.launchPath = "/usr/bin/open" // This should be the same on all installations of macOS
 
     task.arguments = ["-a", "CodeEdit"]
 

CodeEditModules/Modules/About/src/AboutView.swift

@@ -12,8 +12,6 @@ import Acknowledgements
 public struct AboutView: View {
     @Environment(\.openURL) private var openURL
 
-    @State private var hoveringOnCommitHash = false
-
     public init() {}
 
     private var appVersion: String {
@@ -24,17 +22,6 @@ public struct AboutView: View {
         Bundle.buildString ?? "No Build"
     }
 
-    private var commitHash: String {
-        Bundle.commitHash ?? "No Hash"
-    }
-
-    private var shortCommitHash: String {
-        if commitHash.count > 7 {
-            return String(commitHash[...commitHash.index(commitHash.startIndex, offsetBy: 7)])
-        }
-        return commitHash
-    }
-
     public var body: some View {
         HStack(spacing: 0) {
             logo
@@ -64,18 +51,6 @@ public struct AboutView: View {
                 .textSelection(.enabled)
                 .foregroundColor(.secondary)
                 .font(.system(size: 13, weight: .light))
-            HStack(spacing: 2.0) {
-                Text("Commit:")
-                Text(self.hoveringOnCommitHash ?
-                     commitHash : shortCommitHash)
-                .textSelection(.enabled)
-                .onHover { hovering in
-                    self.hoveringOnCommitHash = hovering
-                }
-                .animation(.easeInOut, value: self.hoveringOnCommitHash)
-            }
-            .foregroundColor(.secondary)
-            .font(.system(size: 10, weight: .light))
         }
     }
 

CodeEditModules/Modules/CodeEditUtils/src/Extensions/Bundle+Info.swift

@@ -18,9 +18,4 @@ public extension Bundle {
     static var buildString: String? {
         Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String
     }
-
-    /// Returns the main bundle's commitHash string if available (e.g. 7dbca499d2ae5e4a6d674c6cb498a862e930f4c3)
-    static var commitHash: String? {
-        Bundle.main.object(forInfoDictionaryKey: "GitHash") as? String
-    }
 }

CodeEditModules/Modules/WelcomeModule/src/WelcomeView.swift

@@ -39,15 +39,15 @@ public struct WelcomeView: View {
     }
 
     private var appVersion: String {
-        Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? ""
+        Bundle.versionString ?? ""
     }
 
     private var appBuild: String {
-        Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? ""
+        Bundle.buildString ?? ""
     }
 
-    /// Get the MacOS version & build
-    private var macOsVersion: String {
+    /// Get the macOS version & build
+    private var macOSVersion: String {
         let url = URL(fileURLWithPath: "/System/Library/CoreServices/SystemVersion.plist")
         guard let dict = NSDictionary(contentsOf: url),
            let version = dict["ProductUserVisibleVersion"],
@@ -75,24 +75,11 @@ public struct WelcomeView: View {
         return "\(version) (\(build))"
     }
 
-    /// Get the last commit hash.
-    private var getGitHash: String? {
-        if let hash = Bundle.main.infoDictionary?["GitHash"] as? String {
-            return hash
-        }
-
-        return nil
-    }
-
     /// Get program and operating system information
     private func copyInformation() {
         var copyString = "CodeEdit: \(appVersion) (\(appBuild))\n"
 
-        if let hash = getGitHash {
-            copyString.append("Commit: \(hash)\n")
-        }
-
-        copyString.append("MacOS: \(macOsVersion)\n")
+        copyString.append("macOS: \(macOSVersion)\n")
 
         if let xcodeVersion = xcodeVersion {
             copyString.append("Xcode: \(xcodeVersion)")