Fix compilation issues with latest dependencies

Kickflip · Dec 9, 2015 · 80a3c33 · 80a3c33
1 parent 00d550b
commit 80a3c33
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 93 deletions.
diff --git a/Example/KFDemoViewController.m b/Example/KFDemoViewController.m
@@ -73,14 +73,16 @@ - (void) setupDatabase {
 }
 
 - (void) setupDatabaseView {
-    YapDatabaseViewBlockType groupingBlockType;
-    YapDatabaseViewGroupingWithObjectBlock groupingBlock;
-
-    YapDatabaseViewBlockType sortingBlockType;
-    YapDatabaseViewSortingWithObjectBlock sortingBlock;
+    YapDatabaseViewSorting *sorting = [YapDatabaseViewSorting withObjectBlock:^NSComparisonResult(NSString *group, NSString *collection1, NSString *key1, id object1, NSString *collection2, NSString *key2, id object2) {
+        if ([group isEqualToString:kKFStreamsGroup]) {
+            KFStream *stream1 = object1;
+            KFStream *stream2 = object2;
+            return [stream2.startDate compare:stream1.startDate];
+        }
+        return NSOrderedSame;
+    }];
 
-    groupingBlockType = YapDatabaseViewBlockTypeWithObject;
-    groupingBlock = ^NSString *(NSString *collection, NSString *key, id object){
+    YapDatabaseViewGrouping *grouping = [YapDatabaseViewGrouping withObjectBlock:^NSString *(NSString *collection, NSString *key, id object) {
         if ([object isKindOfClass:[KFStream class]]) {
             KFStream *stream = object;
             // Hide streams without thumbnails for now
@@ -90,27 +92,11 @@ - (void) setupDatabaseView {
             return kKFStreamsGroup;
         }
         return nil; // exclude from view
-    };
+    }];
 
-    sortingBlockType = YapDatabaseViewBlockTypeWithObject;
-    sortingBlock = ^NSComparisonResult(NSString *group, NSString *collection1, NSString *key1, id obj1,
-                     NSString *collection2, NSString *key2, id obj2){
-        if ([group isEqualToString:kKFStreamsGroup]) {
-            KFStream *stream1 = obj1;
-            KFStream *stream2 = obj2;
-            return [stream2.startDate compare:stream1.startDate];
-        }
-        return NSOrderedSame;
-    };
+    YapDatabaseView *databaseView = [[YapDatabaseView alloc] initWithGrouping:grouping sorting:sorting];
 
-    YapDatabaseView *databaseView =
-    [[YapDatabaseView alloc] initWithGroupingBlock:groupingBlock
-                                 groupingBlockType:groupingBlockType
-                                      sortingBlock:sortingBlock
-                                  sortingBlockType:sortingBlockType];
     [self.database registerExtension:databaseView withName:kKFStreamView];
-
-
 }
 
 
@@ -285,9 +271,10 @@ - (void) refreshStreams {
                 }
                 [transaction setObject:newStream forKey:stream.streamID inCollection:kKFStreamsCollection];
             }
-        } completionBlock:^{
+        } completionQueue:dispatch_get_main_queue()
+          completionBlock:^{
             [self.pullToRefreshView finishLoading];
-        } completionQueue:dispatch_get_main_queue()];
+        }];
     }];
 }
 

diff --git a/Kickflip.xcodeproj/project.pbxproj b/Kickflip.xcodeproj/project.pbxproj
@@ -176,6 +176,7 @@
 				D945ADA0189853A80026F697 /* Frameworks */,
 				D945ADA1189853A80026F697 /* Resources */,
 				ED2B2FA4594E4D2FB926AF71 /* Copy Pods Resources */,
+				4D1E4AA9D6860A7408476908 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -228,6 +229,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		4D1E4AA9D6860A7408476908 /* 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/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		D9F50E0F18FC956F00A71C1F /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/Kickflip.xcworkspace/xcshareddata/Kickflip.xcscmblueprint b/Kickflip.xcworkspace/xcshareddata/Kickflip.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "D0BD4C1CFF3E9C17A2326588C2A94030033271A4",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "D0BD4C1CFF3E9C17A2326588C2A94030033271A4" : 0,
+    "8359C4C1F827A159C9EDE1E14CD27BC93B5B0027" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "EAFB882F-7FE2-4C38-A474-3711021E2FFE",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "D0BD4C1CFF3E9C17A2326588C2A94030033271A4" : "kickflip-ios-example\/",
+    "8359C4C1F827A159C9EDE1E14CD27BC93B5B0027" : "kickflip-ios-example\/Submodules\/kickflip-ios-sdk\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "Kickflip",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Kickflip.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:Kickflip\/kickflip-ios-sdk.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8359C4C1F827A159C9EDE1E14CD27BC93B5B0027"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:PerchLive\/kickflip-ios-example.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D0BD4C1CFF3E9C17A2326588C2A94030033271A4"
+    }
+  ]
+}
diff --git a/Podfile b/Podfile
@@ -2,10 +2,10 @@
 platform :ios, "8.0"
 
 # When making modifications to the SDK, using the line below can be useful
-# pod 'Kickflip', :path => 'Submodules/kickflip-ios-sdk/Kickflip.podspec'
+pod 'Kickflip', :path => 'Submodules/kickflip-ios-sdk/Kickflip.podspec'
 
 
-pod 'Kickflip' , '~> 1.3'
+# pod 'Kickflip' , '~> 1.3'
 pod 'YapDatabase', '~> 2.5'
 pod 'SSPullToRefresh', '~> 1.2'
 pod 'UIAlertView-Blocks', '~> 1.0'

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,46 +1,31 @@
 PODS:
-  - AFNetworking (2.5.3):
-    - AFNetworking/NSURLConnection (= 2.5.3)
-    - AFNetworking/NSURLSession (= 2.5.3)
-    - AFNetworking/Reachability (= 2.5.3)
-    - AFNetworking/Security (= 2.5.3)
-    - AFNetworking/Serialization (= 2.5.3)
-    - AFNetworking/UIKit (= 2.5.3)
-  - AFNetworking/NSURLConnection (2.5.3):
+  - AFNetworking (2.6.3):
+    - AFNetworking/NSURLConnection (= 2.6.3)
+    - AFNetworking/NSURLSession (= 2.6.3)
+    - AFNetworking/Reachability (= 2.6.3)
+    - AFNetworking/Security (= 2.6.3)
+    - AFNetworking/Serialization (= 2.6.3)
+    - AFNetworking/UIKit (= 2.6.3)
+  - AFNetworking/NSURLConnection (2.6.3):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.5.3):
+  - AFNetworking/NSURLSession (2.6.3):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (2.5.3)
-  - AFNetworking/Security (2.5.3)
-  - AFNetworking/Serialization (2.5.3)
-  - AFNetworking/UIKit (2.5.3):
+  - AFNetworking/Reachability (2.6.3)
+  - AFNetworking/Security (2.6.3)
+  - AFNetworking/Serialization (2.6.3)
+  - AFNetworking/UIKit (2.6.3):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
   - AFOAuth2Manager (2.2.0):
     - AFNetworking/NSURLConnection (~> 2.2)
-  - AWSCore (2.1.1):
-    - Bolts (~> 1.1.0)
-    - GZIP (~> 1.0.3)
-    - Mantle (~> 1.4)
-    - Reachability (~> 3.1)
-    - UICKeyChainStore (~> 2.0)
-    - XMLDictionary (~> 1.4.0)
-  - AWSS3 (2.1.1):
-    - AWSCore (= 2.1.1)
-    - Bolts (~> 1.1.0)
-    - Mantle (~> 1.4)
-    - TMCache (~> 1.2.1)
+  - AWSCore (2.3.2)
+  - AWSS3 (2.3.2):
+    - AWSCore (= 2.3.2)
   - BButton (4.0.2)
-  - Bolts (1.1.5):
-    - Bolts/AppLinks (= 1.1.5)
-    - Bolts/Tasks (= 1.1.5)
-  - Bolts/AppLinks (1.1.5):
-    - Bolts/Tasks
-  - Bolts/Tasks (1.1.5)
   - CocoaLumberjack (1.9.2):
     - CocoaLumberjack/Extensions (= 1.9.2)
   - CocoaLumberjack/Core (1.9.2)
@@ -52,7 +37,6 @@ PODS:
   - FFmpegWrapper (1.0):
     - FFmpeg (~> 2.2)
   - FormatterKit/TimeIntervalFormatter (1.8.0)
-  - GZIP (1.0.3)
   - Kickflip (1.3):
     - AFNetworking (~> 2.2)
     - AFOAuth2Manager (~> 2.0)
@@ -64,58 +48,52 @@ PODS:
     - PureLayout (~> 2.0)
     - SDWebImage (~> 3.6)
     - SSKeychain (~> 1.2)
-  - Mantle (1.5.4):
-    - Mantle/extobjc (= 1.5.4)
-  - Mantle/extobjc (1.5.4)
+  - Mantle (1.5.6):
+    - Mantle/extobjc (= 1.5.6)
+  - Mantle/extobjc (1.5.6)
   - PureLayout (2.0.6)
-  - Reachability (3.2)
-  - SDWebImage (3.7.2):
-    - SDWebImage/Core (= 3.7.2)
-  - SDWebImage/Core (3.7.2)
+  - SDWebImage (3.7.3):
+    - SDWebImage/Core (= 3.7.3)
+  - SDWebImage/Core (3.7.3)
   - SSKeychain (1.2.3)
-  - SSPullToRefresh (1.2.3)
-  - TMCache (1.2.4)
+  - SSPullToRefresh (1.2.4)
   - UIAlertView-Blocks (1.0)
-  - UICKeyChainStore (2.0.4)
-  - VTAcknowledgementsViewController (0.13)
-  - XMLDictionary (1.4)
-  - YapDatabase (2.6.2):
-    - YapDatabase/standard (= 2.6.2)
-  - YapDatabase/standard (2.6.2):
+  - VTAcknowledgementsViewController (0.17)
+  - YapDatabase (2.6.5):
+    - YapDatabase/standard (= 2.6.5)
+  - YapDatabase/standard (2.6.5):
     - CocoaLumberjack (~> 1)
 
 DEPENDENCIES:
   - BButton (~> 4.0)
-  - Kickflip (~> 1.3)
+  - Kickflip (from `Submodules/kickflip-ios-sdk/Kickflip.podspec`)
   - SSPullToRefresh (~> 1.2)
   - UIAlertView-Blocks (~> 1.0)
   - VTAcknowledgementsViewController (~> 0.10)
   - YapDatabase (~> 2.5)
 
+EXTERNAL SOURCES:
+  Kickflip:
+    :path: Submodules/kickflip-ios-sdk/Kickflip.podspec
+
 SPEC CHECKSUMS:
-  AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
+  AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
   AFOAuth2Manager: 952eb62e8fd8022971e64c6e8fe28b9e999224af
-  AWSCore: 0e82eabc27a96d765b1e2ad4d30b96c1cd298300
-  AWSS3: 891d269735be0f3c63eab5a2d1ee9d788f2c64ee
+  AWSCore: c2f69975fd2caf38a10736961de28a0105cdb00c
+  AWSS3: 9ac201e7a4ad8be0b68348c77acfd100027b97af
   BButton: ab0f2ed3b998ae73c5188b57d270d81e4a1eeb27
-  Bolts: aac24961496d504aa56fc267cde95162a71bac39
   CocoaLumberjack: 628fca2e88ef06f7cf6817309aa405f325d9a6fa
   FFmpeg: e004e90bdac48219b272e7bea11671a25bb0a9b9
   FFmpegWrapper: 9a932581137d17203e842ce942e171158336ae16
   FormatterKit: bddde83e054edf9d9ee14f9de3b3a5103db256f4
-  GZIP: f0863fda354e8f83316508c0a2c7bbe385e39129
   Kickflip: 18b5cbec453592576185efe570e228eee7190387
-  Mantle: 60acd0cd363e27d945bda0a6b8e90577112d28f3
+  Mantle: a197db93e0f1e36194b1fdbc078219a8492eaef2
   PureLayout: f25f0bb904d5ccfe6e31da3cb869185259f02e0d
-  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
+  SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
-  SSPullToRefresh: ae69778f6961120bd906e6349602c6918e609368
-  TMCache: a93984b045a5ee84bd8941bd5e0b54296059cc52
+  SSPullToRefresh: 369e862c1d6528c7a354fc85cd4763d4e670e9af
   UIAlertView-Blocks: 7904744fca618afbd2ec646608924f5e69d5acd1
-  UICKeyChainStore: 69eb0c3a6f669bccf16ba88de3b9069b71501361
-  VTAcknowledgementsViewController: f2391b007c3abafd3b3afccda7d8914a59b44309
-  XMLDictionary: f9f51601ba76678b594ab485f2b00ec1fed23724
-  YapDatabase: 2898ddb5dfbef699539a2a673bf900831f4eca8b
+  VTAcknowledgementsViewController: 6056f5f5e5ed995bbf0581bed6ddd29355ca9a80
+  YapDatabase: 814f9ff862a95c1e581d93335a4020482b69155b
 
-COCOAPODS: 0.37.1
+COCOAPODS: 0.39.0
diff --git a/Submodules/kickflip-ios-sdk b/Submodules/kickflip-ios-sdk
+3 −3		Kickflip/Outputs/Muxers/HLS/KFHLSUploader.m
+1 −1		Kickflip/Utilities/KFAWSCredentialsProvider.h
+3 −3		Kickflip/Utilities/KFAWSCredentialsProvider.m