Merge branch 'main' into feature/rename-schema-types

apollographql · Jun 13, 2024 · 8c4bdec · 8c4bdec
2 parents 53dde87 + 5bc0a45
commit 8c4bdec
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.package.resolved b/.package.resolved
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
-        "version" : "1.1.0"
+        "revision" : "ee97538f5b81ae89698fd95938896dec5217b148",
+        "version" : "1.1.1"
       }
     }
   ],

diff --git a/Tests/ApolloTests/RequestChainTests.swift b/Tests/ApolloTests/RequestChainTests.swift
@@ -870,6 +870,8 @@ class RequestChainTests: XCTestCase {
   }
 
   func test__memory_management__givenOperation_withEarlyAndFinalInterceptorChainExit_shouldNotHaveRetainCycle_andShouldNotCrash() throws {
+    throw XCTSkip("Flaky test skipped in PR #386- must be refactored or fixed in a separate PR.")
+
     // given
     let store = ApolloStore(cache: InMemoryNormalizedCache(records: [
       "QUERY_ROOT": [

diff --git a/apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/package.json b/apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "15.2.3",
-    "@rollup/plugin-replace": "5.0.5",
+    "@rollup/plugin-replace": "5.0.7",
     "@rollup/plugin-typescript": "11.1.6",
     "@types/common-tags": "1.8.4",
     "@types/jest": "29.5.12",

diff --git a/apollo-ios/Sources/ApolloSQLite/SQLiteDotSwiftDatabase.swift b/apollo-ios/Sources/ApolloSQLite/SQLiteDotSwiftDatabase.swift
@@ -8,8 +8,8 @@ public final class SQLiteDotSwiftDatabase: SQLiteDatabase {
   private var db: Connection!
 
   private let records: Table
-  private let keyColumn: Expression<CacheKey>
-  private let recordColumn: Expression<String>
+  private let keyColumn: SQLite.Expression<CacheKey>
+  private let recordColumn: SQLite.Expression<String>
 
   public init(fileURL: URL) throws {
     self.records = Table(Self.tableName)
@@ -27,9 +27,9 @@ public final class SQLiteDotSwiftDatabase: SQLiteDatabase {
 
   public func createRecordsTableIfNeeded() throws {
     try self.db.run(self.records.create(ifNotExists: true) { table in
-      table.column(Expression<Int64>(Self.idColumnName), primaryKey: .autoincrement)
+      table.column(SQLite.Expression<Int64>(Self.idColumnName), primaryKey: .autoincrement)
       table.column(keyColumn, unique: true)
-      table.column(Expression<String>(Self.recordColumName))
+      table.column(SQLite.Expression<String>(Self.recordColumName))
     })
     try self.db.run(self.records.createIndex(keyColumn, unique: true, ifNotExists: true))
   }