From 8dbb484c25f5aeecc027acfe0b885df8f954b8a3 Mon Sep 17 00:00:00 2001
From: Andrew-Walz-HS <47363368+Andrew-Walz-HS@users.noreply.github.com>
Date: Tue, 30 Jul 2019 11:31:33 -0700
Subject: [PATCH] MBL-0: Fix Version String (#16)
* MBL-0: Updated info.plist
* MBL-0: Removed set version
* MBL-0: Removed more run phases
---
Demo/Sources/AppDelegate.swift | 2 +-
Emit.xcodeproj/project.pbxproj | 48 ----------------------------------
Resources/Info.plist | 2 +-
3 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/Demo/Sources/AppDelegate.swift b/Demo/Sources/AppDelegate.swift
index e6e5234..1db52a9 100644
--- a/Demo/Sources/AppDelegate.swift
+++ b/Demo/Sources/AppDelegate.swift
@@ -18,7 +18,7 @@ import UIKit
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
- private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+ internal func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
window?.makeKeyAndVisible()
return true
}
diff --git a/Emit.xcodeproj/project.pbxproj b/Emit.xcodeproj/project.pbxproj
index ce4a88b..90d06f2 100644
--- a/Emit.xcodeproj/project.pbxproj
+++ b/Emit.xcodeproj/project.pbxproj
@@ -362,7 +362,6 @@
A8C860971DA5B1EF00F4B309 /* Frameworks */,
A8C860981DA5B1EF00F4B309 /* Headers */,
A8C860991DA5B1EF00F4B309 /* Resources */,
- A81982F61DB003030086BAB1 /* Set version number */,
);
buildRules = (
);
@@ -380,7 +379,6 @@
A8C860A01DA5B1EF00F4B309 /* Sources */,
A8C860A11DA5B1EF00F4B309 /* Frameworks */,
A8C860A21DA5B1EF00F4B309 /* Resources */,
- A81982F71DB003100086BAB1 /* Set version number */,
);
buildRules = (
);
@@ -399,7 +397,6 @@
A8C8610B1DA5B71700F4B309 /* Sources */,
A8C8610C1DA5B71700F4B309 /* Frameworks */,
A8C8610D1DA5B71700F4B309 /* Resources */,
- A81982F81DB003210086BAB1 /* Set version number */,
51C1E8B9217790FF005F4023 /* Embed Frameworks */,
);
buildRules = (
@@ -580,51 +577,6 @@
shellScript = "# Don't lint when building for Carthage\nif [ ! -z \"$CARTHAGE\" ]; then exit 0; fi\n\nif which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
showEnvVarsInLog = 0;
};
- A81982F61DB003030086BAB1 /* Set version number */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Set version number";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# Get the version number from the tag in git and the number of commits as the build number\nGIT_VERSION=$(git describe --long --tags | cut -f 1 -d \"-\" | cut -c 2-)\nGIT_BUILD=$(git describe --long --tags | cut -f 2 -d \"-\")\nGIT_HASH=$(git describe --long --tags | cut -f 3 -d \"-\")\necho \"Setting version to $GIT_VERSION, build $GIT_BUILD\"\n\n# Set the version info in plist file\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $GIT_VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $GIT_BUILD\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n";
- showEnvVarsInLog = 0;
- };
- A81982F71DB003100086BAB1 /* Set version number */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Set version number";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# Get the version number from the tag in git and the number of commits as the build number\nGIT_VERSION=$(git describe --long --tags | cut -f 1 -d \"-\" | cut -c 2-)\nGIT_BUILD=$(git describe --long --tags | cut -f 2 -d \"-\")\nGIT_HASH=$(git describe --long --tags | cut -f 3 -d \"-\")\necho \"Setting version to $GIT_VERSION, build $GIT_BUILD\"\n\n# Set the version info in plist file\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $GIT_VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $GIT_BUILD\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n";
- showEnvVarsInLog = 0;
- };
- A81982F81DB003210086BAB1 /* Set version number */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Set version number";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# Get the version number from the tag in git and the number of commits as the build number\nGIT_VERSION=$(git describe --long --tags | cut -f 1 -d \"-\" | cut -c 2-)\nGIT_BUILD=$(git describe --long --tags | cut -f 2 -d \"-\")\nGIT_HASH=$(git describe --long --tags | cut -f 3 -d \"-\")\necho \"Setting version to $GIT_VERSION, build $GIT_BUILD\"\n\n# Set the version info in plist file\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $GIT_VERSION\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $GIT_BUILD\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n";
- showEnvVarsInLog = 0;
- };
A8B7678C1E5B9D0C006A2670 /* Lint */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
diff --git a/Resources/Info.plist b/Resources/Info.plist
index dd94ea5..0f13a39 100644
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 1.0
+ 2.1.0
CFBundleVersion
$(CURRENT_PROJECT_VERSION)
NSHumanReadableCopyright