Merge branch 'release/1.0.0'

XCEssentials · Dec 4, 2016 · de29ac8 · de29ac8
2 parents 4d585cd + 2f09089
commit de29ac8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/Info/MKHValueWrapper.plist b/Info/MKHValueWrapper.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.1</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.1.1</string>
+	<string>1.0.0.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/Info/MKHValueWrapperTst.plist b/Info/MKHValueWrapperTst.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>1.0.0.1</string>
 </dict>
 </plist>
diff --git a/MKHValueWrapper.xcodeproj/project.pbxproj b/MKHValueWrapper.xcodeproj/project.pbxproj
@@ -24,7 +24,7 @@
 		BEC03195A3B2EB5D525C0D17 /* Main.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Main.swift; sourceTree = "<group>"; };
 		EF659EBE8A4E0DF7706CF0CE /* MKHValueWrapper.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = MKHValueWrapper.h; sourceTree = "<group>"; };
 		F33AB0910E1AE9FDC42F0F2A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		F6263323930DE61A98A969B5 /* MKHValueWrapperTst. */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = file; name = MKHValueWrapperTst.; path = MKHValueWrapperTst.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		F6263323930DE61A98A969B5 /* MKHValueWrapperTst.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MKHValueWrapperTst.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -69,7 +69,7 @@
 		23DA8F5A5A707ACE363F3EFB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				F6263323930DE61A98A969B5 /* MKHValueWrapperTst. */,
+				F6263323930DE61A98A969B5 /* MKHValueWrapperTst.xctest */,
 				8471536A7ED5143CD45BDA88 /* MKHValueWrapper. */,
 			);
 			name = Products;
@@ -143,7 +143,7 @@
 			);
 			name = MKHValueWrapperTst;
 			productName = MKHValueWrapperTst;
-			productReference = F6263323930DE61A98A969B5 /* MKHValueWrapperTst. */;
+			productReference = F6263323930DE61A98A969B5 /* MKHValueWrapperTst.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
@@ -208,12 +208,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.0.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UJA88X59XP;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1.0.0.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -256,7 +256,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.0.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -280,7 +280,6 @@
 		99C939307EFE088356CA343D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UJA88X59XP;
@@ -295,20 +294,19 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0.1;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MKHValueWrapper.app/MKHValueWrapper";
 			};
 			name = Debug;
 		};
 		9A6CB30ED71C7D55A1844C54 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.0.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UJA88X59XP;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1.0.0.1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -350,7 +348,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0.0.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -381,7 +379,6 @@
 		E48DE7EB3BE762BDEFDE753C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = UJA88X59XP;
@@ -395,7 +392,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 3.0.1;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MKHValueWrapper.app/MKHValueWrapper";
 			};
 			name = Release;
 		};

diff --git a/Tst/Main.swift b/Tst/Main.swift
@@ -11,8 +11,6 @@ import XCTest
 //@testable
 import MKHValueWrapper
 
-import MKHHelpers
-
 //===
 
 class MKHValueWrapperTst: XCTestCase