Merge branch 'feature/cocoapods' into develop

Author: bcylin

.ruby-version

@@ -0,0 +1 @@
+2.3.1

Example/Example.xcodeproj/project.pbxproj

@@ -163,12 +163,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = B5E9F90D1C8D3B6E00443DC7 /* Build configuration list for PBXNativeTarget "Example" */;
 			buildPhases = (
-				96705876C946719953BCD0C6 /* Check Pods Manifest.lock */,
+				96705876C946719953BCD0C6 /* 📦 Check Pods Manifest.lock */,
 				B5E9F8F71C8D3B6E00443DC7 /* Sources */,
 				B5E9F8F81C8D3B6E00443DC7 /* Frameworks */,
 				B5E9F8F91C8D3B6E00443DC7 /* Resources */,
-				CAB3B20531AAE2438C48D751 /* Embed Pods Frameworks */,
-				7B2FB96C7361D5883F3ADD14 /* Copy Pods Resources */,
+				CAB3B20531AAE2438C48D751 /* 📦 Embed Pods Frameworks */,
+				7B2FB96C7361D5883F3ADD14 /* 📦 Copy Pods Resources */,
 				B5C50ADD1C917F4A0059032B /* Swift Lint */,
 			);
 			buildRules = (
@@ -240,29 +240,29 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		7B2FB96C7361D5883F3ADD14 /* Copy Pods Resources */ = {
+		7B2FB96C7361D5883F3ADD14 /* 📦 Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Copy Pods Resources";
+			name = "📦 Copy Pods Resources";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		96705876C946719953BCD0C6 /* Check Pods Manifest.lock */ = {
+		96705876C946719953BCD0C6 /* 📦 Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Check Pods Manifest.lock";
+			name = "📦 Check Pods Manifest.lock";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -284,14 +284,14 @@
 			shellPath = /bin/sh;
 			shellScript = "if which swiftlint >/dev/null; then swiftlint; fi";
 		};
-		CAB3B20531AAE2438C48D751 /* Embed Pods Frameworks */ = {
+		CAB3B20531AAE2438C48D751 /* 📦 Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 			);
-			name = "Embed Pods Frameworks";
+			name = "📦 Embed Pods Frameworks";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
+ruby "2.3.1"
 
-gem "cocoapods", "~> 0.39.0"
+gem "cocoapods", "1.0.0"
 gem "pry"
 gem "rake"
 gem "xcpretty"

Gemfile.lock

@@ -1,65 +1,69 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.5.2)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (0.9.1)
-    cocoapods (0.39.0)
+    claide (1.0.0)
+    cocoapods (1.0.0)
       activesupport (>= 4.0.2)
-      claide (~> 0.9.1)
-      cocoapods-core (= 0.39.0)
-      cocoapods-downloader (~> 0.9.3)
-      cocoapods-plugins (~> 0.4.2)
-      cocoapods-search (~> 0.1.0)
-      cocoapods-stats (~> 0.6.2)
-      cocoapods-trunk (~> 0.6.4)
-      cocoapods-try (~> 0.5.1)
+      claide (>= 1.0.0, < 2.0)
+      cocoapods-core (= 1.0.0)
+      cocoapods-deintegrate (>= 1.0.0, < 2.0)
+      cocoapods-downloader (>= 1.0.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.0.0, < 2.0)
+      cocoapods-try (>= 1.0.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.4.0)
+      fourflusher (~> 0.3.0)
+      molinillo (~> 0.4.5)
       nap (~> 1.0)
-      xcodeproj (~> 0.28.2)
-    cocoapods-core (0.39.0)
+      xcodeproj (>= 1.0.0, < 2.0)
+    cocoapods-core (1.0.0)
       activesupport (>= 4.0.2)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-downloader (0.9.3)
-    cocoapods-plugins (0.4.2)
+    cocoapods-deintegrate (1.0.0)
+    cocoapods-downloader (1.0.0)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (0.1.0)
-    cocoapods-stats (0.6.2)
-    cocoapods-trunk (0.6.4)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.0.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.5.1)
+    cocoapods-try (1.0.0)
     coderay (1.1.1)
     colored (1.2)
     escape (0.0.4)
+    fourflusher (0.3.1)
     fuzzy_match (2.0.4)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.4)
-    molinillo (0.4.4)
+    minitest (5.9.0)
+    molinillo (0.4.5)
     nap (1.1.0)
     netrc (0.7.8)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.5.0)
+    rake (11.1.2)
     rouge (1.10.1)
     slop (3.6.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (0.28.2)
+    xcodeproj (1.0.0)
       activesupport (>= 3)
-      claide (~> 0.9.1)
+      claide (>= 1.0.0, < 2.0)
       colored (~> 1.2)
     xcpretty (0.2.2)
       rouge (~> 1.8)
@@ -68,10 +72,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 0.39.0)
+  cocoapods (= 1.0.0)
   pry
   rake
   xcpretty
 
+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
-   1.11.2
+   1.12.5

ICInputAccessory.podspec

@@ -24,12 +24,12 @@ Pod::Spec.new do |s|
 
   s.default_subspecs = "KeyboardDismissTextField", "TokenField"
 
-  s.subspec :KeyboardDismissTextField do |sp|
+  s.subspec "KeyboardDismissTextField" do |sp|
     sp.source_files  = "Source/KeyboardDismissTextField/*.swift"
     sp.resources     = "Source/KeyboardDismissTextField/*.xcassets"
   end
 
-  s.subspec :TokenField do |sp|
+  s.subspec "TokenField" do |sp|
     sp.source_files  = "Source/TokenField/*.swift"
   end
 end

Podfile

@@ -2,10 +2,10 @@ platform :ios, "8.0"
 use_frameworks!
 
 workspace "ICInputAccessory"
-xcodeproj "ICInputAccessory"
-xcodeproj "Example/Example"
+project "ICInputAccessory"
+project "Example/Example"
 
-target :Example do
+target "Example" do
   pod "ICInputAccessory/KeyboardDismissTextField", path: "./"
   pod "ICInputAccessory/TokenField", path: "./"
 end

Podfile.lock

@@ -13,4 +13,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   ICInputAccessory: e3c0705263aa7c86cebf96425c95aa716ec83f25
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: bc37f46eb6efd595acab704850534a8198e06d74
+
+COCOAPODS: 1.0.0