Update GRDB, RxSwift, Differ

RxSwiftCommunity · Apr 22, 2019 · aef0fc0 · aef0fc0
1 parent 75e87b0
commit aef0fc0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/Documentation/RxGRDBDemo/RxGRDBDemo.xcodeproj/project.pbxproj b/Documentation/RxGRDBDemo/RxGRDBDemo.xcodeproj/project.pbxproj
@@ -213,15 +213,13 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RxGRDBDemo/Pods-RxGRDBDemo-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GRDB.swift-iOS/GRDB.framework",
-				"${BUILT_PRODUCTS_DIR}/RxAtomic-iOS/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift-iOS/RxSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/Differ/Differ.framework",
 				"${BUILT_PRODUCTS_DIR}/RxGRDB/RxGRDB.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Differ.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxGRDB.framework",

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
-  - Differ (1.3.0)
-  - GRDB.swift (3.7.0)
-  - RxAtomic (4.4.2)
+  - Differ (1.4.1)
+  - GRDB.swift (3.7.0):
+    - GRDB.swift/standard (= 3.7.0)
+  - GRDB.swift/standard (3.7.0)
   - RxGRDB (0.13.0):
     - RxGRDB/default (= 0.13.0)
     - RxSwift (~> 4.0)
   - RxGRDB/default (0.13.0):
     - GRDB.swift (~> 3.5)
     - RxSwift (~> 4.0)
-  - RxSwift (4.4.2):
-    - RxAtomic (>= 4.4.2, ~> 4.4)
+  - RxSwift (4.5.0)
 
 DEPENDENCIES:
   - Differ (~> 1.0)
@@ -20,7 +20,6 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - Differ
-    - RxAtomic
     - RxSwift
 
 EXTERNAL SOURCES:
@@ -32,16 +31,15 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   GRDB.swift:
-    :commit: 900134729a3c6701e68dadb37d97cb9a6cda2d02
+    :commit: bdbcf682c4705d979b18b45195c2b0b49d8f7fb3
     :git: https://github.com/groue/GRDB.swift.git
 
 SPEC CHECKSUMS:
-  Differ: 9fcee7602542d7c6484ce05a0faec1c11258ed63
-  GRDB.swift: 995f3289c25acc7970497a66ac4ee45a30c7b12c
-  RxAtomic: d00e97c10db88c6f08540e0bf2752fc5a2404167
+  Differ: ca4350872e32a1aeedf3d9e2d9e47127833bfa9c
+  GRDB.swift: 71ab04a6e727e34c034513c4d15901ea35eb1f0d
   RxGRDB: 2e5301d274550d0844d586a4dfa5ef0c0bd10cf0
-  RxSwift: 74c29b693c8e42b0f64400e8b06564575742d649
+  RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
 
 PODFILE CHECKSUM: ab703e3809c7113eb0329b2a011355160f1b66d1
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.6.1
diff --git a/RxGRDB.xcodeproj/project.pbxproj b/RxGRDB.xcodeproj/project.pbxproj
@@ -439,13 +439,11 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RxGRDBiOSTests/Pods-RxGRDBiOSTests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GRDB.swift-iOS/GRDB.framework",
-				"${BUILT_PRODUCTS_DIR}/RxAtomic-iOS/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift-iOS/RxSwift.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -497,13 +495,11 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RxGRDBmacOSTests/Pods-RxGRDBmacOSTests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GRDB.swift-macOS/GRDB.framework",
-				"${BUILT_PRODUCTS_DIR}/RxAtomic-macOS/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift-macOS/RxSwift.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/RxGRDB/DiffSupport.swift b/RxGRDB/DiffSupport.swift
@@ -72,7 +72,7 @@ extension FetchRequest where RowDecoder: TableRecord {
         let columns = try db.primaryKey(RowDecoder.databaseTableName).columns
 
         // Turn column names into statement indexes
-        let (statement, rowAdapter) = try prepare(db)
+        let (statement, rowAdapter) = try prepare(db, forSingleResult: false)
         let rowLayout: RowLayout = try rowAdapter?.layoutedAdapter(from: statement).mapping ?? statement
         let indexes = columns.map { column -> Int in
             guard let index = rowLayout.layoutIndex(ofColumn: column) else {