Merge branch 'immutable-new-operator' into immutable-mappable

tristanhimmelman · tristanhimmelman · commit 38a60b2b7ae6 · 2016-10-03T09:55:14.000-04:00
diff --git a/ObjectMapper.podspec b/ObjectMapper.podspec
@@ -12,6 +12,11 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.9'
   s.tvos.deployment_target = '9.0'
   
+  
+  s.pod_target_xcconfig = {
+    'SWIFT_VERSION' => '3.0',
+  }
+  
   s.requires_arc = 'true'
   s.source_files = 'ObjectMapper/**/*.swift'
 end
diff --git a/ObjectMapper.xcodeproj/project.pbxproj b/ObjectMapper.xcodeproj/project.pbxproj
@@ -1133,7 +1133,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1176,7 +1176,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/ObjectMapper/Core/Map.swift b/ObjectMapper/Core/Map.swift
@@ -40,10 +40,10 @@ public final class Map {
 	
 	public internal(set) var JSON: [String: Any] = [:]
 	public internal(set) var isKeyPresent = false
-	public var currentValue: Any?
-	public var context: MapContext?
+	public internal(set) var currentValue: Any?
 	public internal(set) var currentKey: String?
 	var keyIsNested = false
+	public var context: MapContext?
 	
 	let toObject: Bool // indicates whether the mapping is being applied to an existing object
 	
