From 766a692712ea4c0a51eeadc7ddeffeaccb9c758b Mon Sep 17 00:00:00 2001
From: Chris Ballinger <chrisballinger@gmail.com>
Date: Tue, 27 May 2014 16:19:19 -0700
Subject: [PATCH] Kickflip 1.1 SDK

---
 .gitmodules                 |  3 ---
 Podfile                     |  6 ++----
 Podfile.lock                | 26 ++++++++------------------
 README.md                   |  2 +-
 Submodules/OWS3Client       |  1 -
 Submodules/kickflip-ios-sdk |  2 +-
 6 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 160000 Submodules/OWS3Client

diff --git a/.gitmodules b/.gitmodules
index 797cb5a..b7ba844 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "Submodules/kickflip-ios-sdk"]
 	path = Submodules/kickflip-ios-sdk
 	url = git@github.com:Kickflip/kickflip-ios-sdk.git
-[submodule "Submodules/OWS3Client"]
-	path = Submodules/OWS3Client
-	url = git@github.com:OpenWatch/OWS3Client.git
diff --git a/Podfile b/Podfile
index f8f378b..a28294c 100644
--- a/Podfile
+++ b/Podfile
@@ -2,11 +2,9 @@
 platform :ios, "7.0"
 
 # When making modifications to the SDK, using the line below can be useful
-pod 'Kickflip', :path => 'Submodules/kickflip-ios-sdk/Kickflip.podspec'
-pod 'OWS3Client', :path => 'Submodules/OWS3Client/OWS3Client.podspec'
+#pod 'Kickflip', :path => 'Submodules/kickflip-ios-sdk/Kickflip.podspec'
 
-
-#pod 'Kickflip', '~> 1.0.0'
+pod 'Kickflip', '~> 1.1'
 pod 'YapDatabase', '~> 2.4'
 pod 'SSPullToRefresh', '~> 1.2'
 pod 'UIAlertView-Blocks', '~> 1.0'
diff --git a/Podfile.lock b/Podfile.lock
index 164301e..06c877a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -5,10 +5,10 @@ PODS:
   - AWSiOSSDK/Runtime (1.7.1)
   - AWSiOSSDK/S3 (1.7.1):
     - AWSiOSSDK/Runtime
-  - CocoaLumberjack (1.8.1):
+  - CocoaLumberjack (1.9.0):
     - CocoaLumberjack/Extensions
-  - CocoaLumberjack/Core (1.8.1)
-  - CocoaLumberjack/Extensions (1.8.1):
+  - CocoaLumberjack/Core (1.9.0)
+  - CocoaLumberjack/Extensions (1.9.0):
     - CocoaLumberjack/Core
   - FFmpeg (2.2):
     - FFmpeg/precompiled
@@ -16,22 +16,20 @@ PODS:
   - FFmpegWrapper (1.0):
     - FFmpeg (~> 2.2)
   - FormatterKit/TimeIntervalFormatter (1.4.3)
-  - Kickflip (1.0.0):
+  - Kickflip (1.1):
     - AFNetworking (~> 1.3)
     - AFOAuth2Client (~> 0.1)
+    - AWSiOSSDK/S3 (~> 1.7)
     - CocoaLumberjack (~> 1.0)
     - FFmpegWrapper (~> 1.0)
     - FormatterKit/TimeIntervalFormatter (~> 1.4)
     - Mantle (~> 1.4)
-    - OWS3Client (~> 1.0)
     - SDWebImage (~> 3.6)
     - SSKeychain (~> 1.2)
     - UIView+AutoLayout (~> 1.3)
   - Mantle (1.5):
     - Mantle/extobjc
   - Mantle/extobjc (1.5)
-  - OWS3Client (1.0):
-    - AWSiOSSDK/S3 (~> 1.7)
   - SDWebImage (3.6):
     - SDWebImage/Core
   - SDWebImage/Core (3.6)
@@ -44,30 +42,22 @@ PODS:
     - CocoaLumberjack (~> 1.6.3)
 
 DEPENDENCIES:
-  - Kickflip (from `Submodules/kickflip-ios-sdk/Kickflip.podspec`)
-  - OWS3Client (from `Submodules/OWS3Client/OWS3Client.podspec`)
+  - Kickflip (~> 1.1)
   - SSPullToRefresh (~> 1.2)
   - UIAlertView-Blocks (~> 1.0)
   - VTAcknowledgementsViewController (~> 0.10)
   - YapDatabase (~> 2.4)
 
-EXTERNAL SOURCES:
-  Kickflip:
-    :path: Submodules/kickflip-ios-sdk/Kickflip.podspec
-  OWS3Client:
-    :path: Submodules/OWS3Client/OWS3Client.podspec
-
 SPEC CHECKSUMS:
   AFNetworking: 80c4e0652b08eb34e25b9c0ff3c82556fe5967b4
   AFOAuth2Client: 4f05d29e0a26c7ddf529dd7c4480af6ee1e982c6
   AWSiOSSDK: db382a716be4ce2b2022fa5f0da275c43648d0c7
-  CocoaLumberjack: 9d198d6e19909b3b113a38c5f06f7bb8eedd0427
+  CocoaLumberjack: 5766cdd1d0a24bcf15a133c6023747346bf786dd
   FFmpeg: 7e37c1efa4206e68c225ec0d73b8e3373d537c2a
   FFmpegWrapper: 9564268abcc9660ec5463adbe4b5e01f52b6fdd3
   FormatterKit: f744aa7928003eba8317d6fd6998414fbc78f7a5
-  Kickflip: 83f975ec43ea19657bfaa1a4aea37d4e020d2472
+  Kickflip: e992fd980b6d500e03db6d181a76a536ec2e24dc
   Mantle: c67a7e45e14196ed42b2a7cbb98ff6a9920e6b92
-  OWS3Client: 88e654bf7aa6331dbab1f5ff8cded6e63dd2660b
   SDWebImage: c6989652c1cdf27cbdf3f56957e2030f825af5bc
   SSKeychain: cc48bd3ad24fcd9125adb9e0d23dd50b8bbd08b9
   SSPullToRefresh: bb513a1ccbf08fdd67e4139bc1bbe3fc2ed34228
diff --git a/README.md b/README.md
index 66f6da1..401eb75 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Grab the source code, and then update the dependencies.
 	$ git clone git@github.com:Kickflip/kickflip-ios-example.git
     $ cd kickflip-ios-example
     $ git submodule update --init
-    $ pod
+    $ pod install
     
 If you would like to make modifications to the core SDK, you can integrate the SDK as a submodule as well (check the `Podfile` for more info).
 
diff --git a/Submodules/OWS3Client b/Submodules/OWS3Client
deleted file mode 160000
index f5a573e..0000000
--- a/Submodules/OWS3Client
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f5a573eb61969eedebe33867dcf66e0a19d49b8b
diff --git a/Submodules/kickflip-ios-sdk b/Submodules/kickflip-ios-sdk
index b149975..a92c44b 160000
--- a/Submodules/kickflip-ios-sdk
+++ b/Submodules/kickflip-ios-sdk
@@ -1 +1 @@
-Subproject commit b149975adfb5ee4fee781e1eeb77549461362e3e
+Subproject commit a92c44b4966230a4cdd3841f788df2d9a6cf294d