Merge branch 'release/1.0.2'

Yalantis · Jan 26, 2016 · c219c60 · c219c60
2 parents 9a53637 + 9091691
commit c219c60
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 14 deletions.
diff --git a/FastEasyMapping.podspec b/FastEasyMapping.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'FastEasyMapping'
-  spec.version      = '1.0.1'
+  spec.version      = '1.0.2'
   spec.summary      = 'Fast mapping from JSON to NSObject / NSManagedObject and back'
   spec.homepage     = "https://github.com/Yalantis/FastEasyMapping"
   spec.license      = { :type => 'MIT', :file => 'LICENSE' }

diff --git a/FastEasyMapping.xcodeproj/project.pbxproj b/FastEasyMapping.xcodeproj/project.pbxproj
@@ -631,6 +631,7 @@
 				2CF8098418C3AD5700C07899 /* Sources */,
 				2CF8098518C3AD5700C07899 /* Frameworks */,
 				2CF8098618C3AD5700C07899 /* Resources */,
+				8889EA99FDF2E095312539E3 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -648,7 +649,7 @@
 		2CF8097018C3AD5700C07899 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = Yalantis;
 				TargetAttributes = {
 					2CF8098718C3AD5700C07899 = {
@@ -705,6 +706,24 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		8889EA99FDF2E095312539E3 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastEasyMappingTests/Pods-FastEasyMappingTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		2CF8097418C3AD5700C07899 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -800,6 +819,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -896,6 +916,7 @@
 				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "FastEasyMappingTests/FastEasyMappingTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = FastEasyMappingTests;
 			};
 			name = Debug;
@@ -909,6 +930,7 @@
 				GCC_PREFIX_HEADER = "FastEasyMapping/FastEasyMapping-Prefix.pch";
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "FastEasyMappingTests/FastEasyMappingTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = FastEasyMappingTests;
 			};
 			name = Release;

diff --git a/FastEasyMapping.xcodeproj/xcshareddata/xcschemes/FastEasyMapping.xcscheme b/FastEasyMapping.xcodeproj/xcshareddata/xcschemes/FastEasyMapping.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -11,7 +11,8 @@
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "YES"
+            hideIssues = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "2CF8097718C3AD5700C07899"
@@ -23,10 +24,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,15 +40,18 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -62,10 +66,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction

diff --git a/FastEasyMapping/Source/Core/Mapping/FEMManagedObjectMapping.h b/FastEasyMapping/Source/Core/Mapping/FEMManagedObjectMapping.h
@@ -4,4 +4,4 @@
 
 #import "FEMMapping.h"
 
-@compatibility_alias FEMManagedObjectMapping FEMMapping;
+#define FEMManagedObjectMapping FEMMapping
diff --git a/FastEasyMapping/Source/Core/Mapping/FEMObjectMapping.h b/FastEasyMapping/Source/Core/Mapping/FEMObjectMapping.h
@@ -2,4 +2,4 @@
 
 #import "FEMMapping.h"
 
-@compatibility_alias FEMObjectMapping FEMMapping;
+#define FEMObjectMapping FEMMapping
diff --git a/FastEasyMappingTests/FastEasyMappingTests-Info.plist b/FastEasyMappingTests/FastEasyMappingTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yalantis.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/Podfile.lock b/Podfile.lock
@@ -23,7 +23,7 @@ SPEC CHECKSUMS:
   CMFactory: 535c1473e91f4d0d13cb290de2144faa75a882a3
   Kiwi: 4c3988bd551f80f6ca0009f302f7c1a2e3777bf2
   libextobjc: f2802d4262f6885570df9799747409ceb1de602c
-  MagicalRecord: f8a56bb87ab6552f20c4bb8681a1958a197ea3cd
+  MagicalRecord: 2dc87179ae7c1f2a274442624ec65a07d4357a6f
   Mantle: 3fbcca07bdfe76c54a08c241689a60d34d08e783
 
-COCOAPODS: 0.37.1
+COCOAPODS: 0.39.0
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ It turns out, that almost all popular libraries for JSON mapping are SLOW. The m
 ```ruby
 #Podfile
 platform :ios, '7.0'
-pod 'FastEasyMapping', '~> 1.0.1'
+pod 'FastEasyMapping', '~> 1.0'
 ```
 or add as a static library.