Update CocoaPods

roadmaptravel · May 5, 2019 · 396be58 · 396be58
1 parent 0392050
commit 396be58
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 74 deletions.
diff --git a/Benchmark/Benchmark.xcodeproj/project.pbxproj b/Benchmark/Benchmark.xcodeproj/project.pbxproj
@@ -171,36 +171,11 @@
 			files = (
 			);
 			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Benchmark/Pods-Benchmark-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/DeepDiff/DeepDiff.framework",
-				"${BUILT_PRODUCTS_DIR}/Differ/Differ.framework",
-				"${BUILT_PRODUCTS_DIR}/DifferenceKit/DifferenceKit.framework",
-				"${BUILT_PRODUCTS_DIR}/Differentiator/Differentiator.framework",
-				"${BUILT_PRODUCTS_DIR}/Dwifft/Dwifft.framework",
-				"${BUILT_PRODUCTS_DIR}/FlexibleDiff/FlexibleDiff.framework",
-				"${BUILT_PRODUCTS_DIR}/IGListKit/IGListKit.framework",
-				"${BUILT_PRODUCTS_DIR}/RxCocoa/RxCocoa.framework",
-				"${BUILT_PRODUCTS_DIR}/RxDataSources/RxDataSources.framework",
-				"${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework",
-				"${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-Benchmark/Pods-Benchmark-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DeepDiff.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differ.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DifferenceKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differentiator.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Dwifft.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexibleDiff.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IGListKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxDataSources.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
+				"${PODS_ROOT}/Target Support Files/Pods-Benchmark/Pods-Benchmark-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/Benchmark/Gemfile b/Benchmark/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem 'cocoapods', '1.6.1'
+gem 'cocoapods', '1.7.0.rc.1'
diff --git a/Benchmark/Gemfile.lock b/Benchmark/Gemfile.lock
@@ -9,11 +9,11 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.6.1)
+    cocoapods (1.7.0.rc.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.7.0.rc.1)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
@@ -27,8 +27,8 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      xcodeproj (>= 1.8.2, < 2.0)
+    cocoapods-core (1.7.0.rc.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -59,7 +59,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.8.2)
+    xcodeproj (1.9.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -70,7 +70,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.6.1)
+  cocoapods (= 1.7.0.rc.1)
 
 BUNDLED WITH
    2.0.1
diff --git a/Benchmark/Podfile b/Benchmark/Podfile
@@ -7,7 +7,7 @@ ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 
 target 'Benchmark' do
   pod 'DifferenceKit', path: '../'
-  pod 'RxDataSources', '4.0.1'
+  pod 'Differentiator', '4.0.1'
   pod 'FlexibleDiff', '0.0.8'
   pod 'IGListKit', '3.4.0'
   pod 'DeepDiff', '2.0.1'

diff --git a/Benchmark/Podfile.lock b/Benchmark/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
   - DeepDiff (2.0.1)
   - Differ (1.4.1)
-  - DifferenceKit (1.1.1):
-    - DifferenceKit/Core (= 1.1.1)
-    - DifferenceKit/UIKitExtension (= 1.1.1)
-  - DifferenceKit/Core (1.1.1)
-  - DifferenceKit/UIKitExtension (1.1.1):
+  - DifferenceKit (1.1.2):
+    - DifferenceKit/Core (= 1.1.2)
+    - DifferenceKit/UIKitExtension (= 1.1.2)
+  - DifferenceKit/Core (1.1.2)
+  - DifferenceKit/UIKitExtension (1.1.2):
     - DifferenceKit/Core
   - Differentiator (4.0.1)
   - Dwifft (0.9)
@@ -15,25 +15,15 @@ PODS:
   - IGListKit/Default (3.4.0):
     - IGListKit/Diffing
   - IGListKit/Diffing (3.4.0)
-  - RxCocoa (5.0.0):
-    - RxRelay (~> 5)
-    - RxSwift (~> 5)
-  - RxDataSources (4.0.1):
-    - Differentiator (~> 4.0)
-    - RxCocoa (~> 5.0)
-    - RxSwift (~> 5.0)
-  - RxRelay (5.0.0):
-    - RxSwift (~> 5)
-  - RxSwift (5.0.0)
 
 DEPENDENCIES:
   - DeepDiff (= 2.0.1)
   - Differ (= 1.4.1)
   - DifferenceKit (from `../`)
+  - Differentiator (= 4.0.1)
   - Dwifft (= 0.9)
   - FlexibleDiff (= 0.0.8)
   - IGListKit (= 3.4.0)
-  - RxDataSources (= 4.0.1)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -43,10 +33,6 @@ SPEC REPOS:
     - Dwifft
     - FlexibleDiff
     - IGListKit
-    - RxCocoa
-    - RxDataSources
-    - RxRelay
-    - RxSwift
 
 EXTERNAL SOURCES:
   DifferenceKit:
@@ -55,16 +41,12 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   DeepDiff: 1944bb2c841ab238a66b31de1faa7627f3ca84bd
   Differ: ca4350872e32a1aeedf3d9e2d9e47127833bfa9c
-  DifferenceKit: cf1b84e2207ea45c3640381cb229cf46c1647466
+  DifferenceKit: 3a1cff9ac9a9cdf2a3f205671067797e83c3f066
   Differentiator: 886080237d9f87f322641dedbc5be257061b0602
   Dwifft: 42912068ed2a8146077d1a1404df18625bd086e1
   FlexibleDiff: 4f487778bd152088a9528a0a9be06eba7952bb00
   IGListKit: 7a5d788e9fb746bcd402baa8e8b24bc3bd2a5a07
-  RxCocoa: fcf32050ac00d801f34a7f71d5e8e7f23026dcd8
-  RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114
-  RxRelay: 4f7409406a51a55cd88483f21ed898c234d60f18
-  RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
 
-PODFILE CHECKSUM: 551831665cc13a12570a723635fb39fa0aaab88b
+PODFILE CHECKSUM: 23af01fe899c46fcc51f3bfb5ea8d445f4c1d895
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0.rc.1
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem 'cocoapods', '1.6.1'
+gem 'cocoapods', '1.7.0.rc.1'
 gem 'jazzy', '0.9.4'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,11 +9,11 @@ GEM
       tzinfo (~> 1.1)
     atomos (0.1.3)
     claide (1.0.2)
-    cocoapods (1.6.1)
+    cocoapods (1.7.0.rc.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.7.0.rc.1)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
@@ -27,12 +27,12 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      xcodeproj (>= 1.8.2, < 2.0)
+    cocoapods-core (1.7.0.rc.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.3)
+    cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
@@ -74,18 +74,18 @@ GEM
     redcarpet (3.4.0)
     rouge (3.3.0)
     ruby-macho (1.4.0)
-    sass (3.7.3)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sqlite3 (1.4.0)
+    sqlite3 (1.4.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.8.1)
+    xcodeproj (1.9.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -96,7 +96,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.6.1)
+  cocoapods (= 1.7.0.rc.1)
   jazzy (= 0.9.4)
 
 BUNDLED WITH