- Reenable support for iOS 11

- Fix rep count string with no weight during execution
piscoTech · Sep 17, 2019 · b38e629 · b38e629
1 parent 283ccfd
commit b38e629
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Gym Tracker Core/GTRepsSet.swift b/Gym Tracker Core/GTRepsSet.swift
@@ -94,6 +94,8 @@ final public class GTRepsSet: GTSet {
 		if let w = weight.secondaryInfoDescription(withChange: change) {
 			let weight = [GTRepsSet.timesSignLabel, w, secondaryInfoLabel]
 			repsDescription.replace("|", with: weight.joined())
+		} else {
+			repsDescription.replace("|", with: "")
 		}
 
 		return repsDescription

diff --git a/Gym Tracker.xcodeproj/project.pbxproj b/Gym Tracker.xcodeproj/project.pbxproj
@@ -1681,7 +1681,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1701,9 +1701,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEALTH_READ_DATA = "Monitor heart rate during workout and read data for creating a workout.";
 				HEALTH_WRITE_DATA = "Save completed gym workout.";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.1;
+				MARKETING_VERSION = 3.1.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1747,7 +1747,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 19;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1761,9 +1761,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEALTH_READ_DATA = "Monitor heart rate during workout and read data for creating a workout.";
 				HEALTH_WRITE_DATA = "Save completed gym workout.";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.1;
+				MARKETING_VERSION = 3.1.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;

diff --git a/Gym Tracker.xcodeproj/xcuserdata/marcoboschi.xcuserdatad/xcschemes/xcschememanagement.plist b/Gym Tracker.xcodeproj/xcuserdata/marcoboschi.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,17 +12,17 @@
 		<key>Gym Tracker Core watchOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 		<key>Gym Tracker Notifications.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Gym Tracker watchOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>Gym Tracker.xcscheme_^#shared#^_</key>
 		<dict>