Merge upcoming-release into master

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.6
+- Implemented Cocoapods support
+- Removed Context from public API
+- Added iPhone 4s and iPad 12 - 2nd gen. presentations
+- Updated test example
+- Fixed wrong trait collections
+- Added pretty Readme, Contribution and pr template files
+
 ## 1.5
 - Updated copyrights and added LICENSE;
 - Added snapshot testing example;

SnappyShrimp.xcodeproj/project.pbxproj

@@ -266,7 +266,6 @@
 				4214CBF51FDFE34A00C7AB61 /* Frameworks */,
 				4214CBF61FDFE34A00C7AB61 /* Headers */,
 				4214CBF71FDFE34A00C7AB61 /* Resources */,
-				06CF33A21FE81FD6007B0B74 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -337,20 +336,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		06CF33A21FE81FD6007B0B74 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/FBSnapshotTestCase.framework",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks";
-		};
 		06F6C6681FF3FF3100E055F0 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -570,8 +555,10 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = 95F456P57Y;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -583,7 +570,7 @@
 				INFOPLIST_FILE = SnappyShrimp/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = Personal.SnappyShrimp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.RomanTysiachnik.SnappyShrimp;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -599,6 +586,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = 95F456P57Y;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -610,7 +598,7 @@
 				INFOPLIST_FILE = SnappyShrimp/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = Personal.SnappyShrimp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.RomanTysiachnik.SnappyShrimp;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 4.0;

SnappyShrimp/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.6</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>