Updated ObjectMapper to 3.3. Updated Swift version to 4.2.

HamblinSoft · Sep 17, 2018 · 467bad0 · 467bad0
1 parent c196b49
commit 467bad0
Show file tree

Hide file tree

Showing 9 changed files with 641 additions and 621 deletions.
diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Podfile b/Podfile
@@ -4,7 +4,7 @@
 inhibit_all_warnings!
 
 def common_pods
-    pod 'ObjectMapper', '~> 3.1'
+    pod 'ObjectMapper', '~> 3.3'
 end
 
 target 'TeslaKit' do

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
   - ObjectMapper (3.3.0)
-  - SwiftLint (0.26.0)
-  - TeslaKit (1.0.1):
-    - ObjectMapper (~> 3.1)
+  - SwiftLint (0.27.0)
+  - TeslaKit (1.2):
+    - ObjectMapper (~> 3.3)
 
 DEPENDENCIES:
-  - ObjectMapper (~> 3.1)
+  - ObjectMapper (~> 3.3)
   - SwiftLint
   - TeslaKit (from `./`)
 
@@ -20,9 +20,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   ObjectMapper: b612bf8c8e99c4dc0bb6013a51f7c27966ed5da9
-  SwiftLint: f6b83e8d95ee1e91e11932d843af4fdcbf3fc764
-  TeslaKit: 0939b77a592893157c647106f7ffa6a08ce52368
+  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
+  TeslaKit: 671157247848b301908011baffadc158fae2f500
 
-PODFILE CHECKSUM: aa0756f8e0b5e57db082d49cdac6a7d75c3a012d
+PODFILE CHECKSUM: 3a15189ce664d37d9a6dc0144f52f62670e6c4d7
 
 COCOAPODS: 1.5.3
diff --git a/Pods/Local Podspecs/TeslaKit.podspec.json b/Pods/Local Podspecs/TeslaKit.podspec.json
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/SwiftLint/swiftlint b/Pods/SwiftLint/swiftlint
diff --git a/Pods/Target Support Files/TeslaKit/Info.plist b/Pods/Target Support Files/TeslaKit/Info.plist
diff --git a/TeslaKit.xcodeproj/project.pbxproj b/TeslaKit.xcodeproj/project.pbxproj
@@ -484,14 +484,17 @@
 				TargetAttributes = {
 					375D885A200ECEE000CD9D1E = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					37FB3F1C2026533500409472 = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					37FB3F322026534600409472 = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 37FB3F1C2026533500409472;
 					};
@@ -922,7 +925,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.jjjjaren.TeslaKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -944,7 +947,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.jjjjaren.TeslaKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -961,7 +964,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jjjjaren.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -978,7 +981,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jjjjaren.Example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -994,7 +997,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jjjjaren.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};
@@ -1011,7 +1014,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jjjjaren.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};