diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e818104f5134964f332f0f51b893743a2816fe7..9f8233b4902e5d7047d7011f3948f29aa559418a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,14 @@
before_script:
- - for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts
- - for ip in $(dig @8.8.8.8 git.xx.network +short); do ssh-keyscan git.xx.network,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts
+ - echo $CI_BUILD_REF
+ - echo $CI_PROJECT_DIR
+ - echo $PWD
- swift --version
- xcodebuild -version
+ - eval $(ssh-agent -s)
+ - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+ - mkdir -p ~/.ssh
+ - chmod 700 ~/.ssh
+ - ssh-keyscan -t rsa $GITLAB_SERVER > ~/.ssh/known_hosts
stages:
- test
diff --git a/Examples/xx-messenger/Package.swift b/Examples/xx-messenger/Package.swift
index a8f31a2d90dbace950600ac765369968e80a406f..4cf167f95221db4aa4230d79f1cba10952f7a19f 100644
--- a/Examples/xx-messenger/Package.swift
+++ b/Examples/xx-messenger/Package.swift
@@ -2,14 +2,9 @@
import PackageDescription
let swiftSettings: [SwiftSetting] = [
- .unsafeFlags(
- [
- // "-Xfrontend", "-warn-concurrency",
- // "-Xfrontend", "-debug-time-function-bodies",
- // "-Xfrontend", "-debug-time-expression-type-checking",
- ],
- .when(configuration: .debug)
- ),
+ //.unsafeFlags(["-Xfrontend", "-warn-concurrency"], .when(configuration: .debug)),
+ //.unsafeFlags(["-Xfrontend", "-debug-time-function-bodies"], .when(configuration: .debug)),
+ //.unsafeFlags(["-Xfrontend", "-debug-time-expression-type-checking"], .when(configuration: .debug)),
]
let package = Package(
@@ -44,7 +39,7 @@ let package = Package(
),
.package(
url: "https://git.xx.network/elixxir/client-ios-db.git",
- .upToNextMajor(from: "1.1.0")
+ .upToNextMajor(from: "1.2.0")
),
.package(
url: "https://github.com/darrarski/swift-composable-presentation.git",
diff --git a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerConfirmTests.swift b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerConfirmTests.swift
index 1a1b5f19573669403a069bd4e3cecd2e11347e73..0f5043ab3b50a18c3b9c50d2615c35c7c159f853 100644
--- a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerConfirmTests.swift
+++ b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerConfirmTests.swift
@@ -15,7 +15,7 @@ final class AuthCallbackHandlerConfirmTests: XCTestCase {
)
let confirm = AuthCallbackHandlerConfirm.live(
db: .init {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return [dbContact]
@@ -41,7 +41,7 @@ final class AuthCallbackHandlerConfirmTests: XCTestCase {
func testConfirmWhenContactNotInDatabase() throws {
let confirm = AuthCallbackHandlerConfirm.live(
db: .init {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { _ in [] }
return db
}
diff --git a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
index 3a7cb6fbf2d475eadfdc10aa854938fad247167b..d8e19ce7a8d7441f63f93ec0263468adad1d2443 100644
--- a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
+++ b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
@@ -14,7 +14,7 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
let request = AuthCallbackHandlerRequest.live(
db: .init {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return []
@@ -54,7 +54,7 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
func testRequestWhenContactInDatabase() throws {
let request = AuthCallbackHandlerRequest.live(
db: .init {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { _ in [.init(id: "id".data(using: .utf8)!)] }
return db
},
diff --git a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerResetTests.swift b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerResetTests.swift
index 9a4407bf758a0c0ba922c154d199b758dea701be..8d07104652bf9412e678d4d09b9c215e99f0a2c8 100644
--- a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerResetTests.swift
+++ b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerResetTests.swift
@@ -15,7 +15,7 @@ final class AuthCallbackHandlerResetTests: XCTestCase {
)
let reset = AuthCallbackHandlerReset.live(
db: .init {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return [dbContact]
@@ -41,7 +41,7 @@ final class AuthCallbackHandlerResetTests: XCTestCase {
func testResetWhenContactNotInDatabase() throws {
let reset = AuthCallbackHandlerReset.live(
db: .init {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { _ in [] }
return db
}
diff --git a/Examples/xx-messenger/Tests/AppCoreTests/MessageListenerHandler/MessageListenerHandlerTests.swift b/Examples/xx-messenger/Tests/AppCoreTests/MessageListenerHandler/MessageListenerHandlerTests.swift
index 4038cb0d36019822347e358c1139809d4877f059..eb1aa60f0f5e9b43601ce2ea5f0c759b865520fb 100644
--- a/Examples/xx-messenger/Tests/AppCoreTests/MessageListenerHandler/MessageListenerHandlerTests.swift
+++ b/Examples/xx-messenger/Tests/AppCoreTests/MessageListenerHandler/MessageListenerHandlerTests.swift
@@ -18,7 +18,7 @@ final class MessageListenerHandlerTests: XCTestCase {
}
var db: DBManagerGetDB = .unimplemented
db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.saveMessage.run = { message in
didSaveMessage.append(message)
return message
diff --git a/Examples/xx-messenger/Tests/AppCoreTests/SendMessage/SendMessageTests.swift b/Examples/xx-messenger/Tests/AppCoreTests/SendMessage/SendMessageTests.swift
index 0ff8536f453530bba378b8279686d344f8cace74..ae4e6f9e0a55e8819b21c0a326e95b73a6c50056 100644
--- a/Examples/xx-messenger/Tests/AppCoreTests/SendMessage/SendMessageTests.swift
+++ b/Examples/xx-messenger/Tests/AppCoreTests/SendMessage/SendMessageTests.swift
@@ -55,7 +55,7 @@ final class SendMessageTests: XCTestCase {
}
var db: DBManagerGetDB = .unimplemented
db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.saveMessage.run = { message in
dbDidSaveMessage.append(message)
var message = message
@@ -238,7 +238,7 @@ final class SendMessageTests: XCTestCase {
}
var db: DBManagerGetDB = .unimplemented
db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.saveMessage.run = { $0 }
db.fetchMessages.run = { _ in [] }
db.bulkUpdateMessages.run = { _, _ in throw error }
diff --git a/Examples/xx-messenger/Tests/ChatFeatureTests/ChatFeatureTests.swift b/Examples/xx-messenger/Tests/ChatFeatureTests/ChatFeatureTests.swift
index 1a513af07195076dabb987bee120111411a6c633..7f0633021b525d1e26517db1ffc87ed073fae3d6 100644
--- a/Examples/xx-messenger/Tests/ChatFeatureTests/ChatFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/ChatFeatureTests/ChatFeatureTests.swift
@@ -34,7 +34,7 @@ final class ChatFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchMessagesPublisher.run = { query in
didFetchMessagesWithQuery.append(query)
return messagesPublisher.eraseToAnyPublisher()
diff --git a/Examples/xx-messenger/Tests/CheckContactAuthFeatureTests/CheckContactAuthFeatureTests.swift b/Examples/xx-messenger/Tests/CheckContactAuthFeatureTests/CheckContactAuthFeatureTests.swift
index 95f5a80773838e9b72d4f8c6e380e0f7ce8799fd..a13645f2f29d6fd2ec3fe87353105cf3adf8df86 100644
--- a/Examples/xx-messenger/Tests/CheckContactAuthFeatureTests/CheckContactAuthFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/CheckContactAuthFeatureTests/CheckContactAuthFeatureTests.swift
@@ -34,7 +34,7 @@ final class CheckContactAuthFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
didBulkUpdateContactsWithAssignments.append(assignments)
@@ -86,7 +86,7 @@ final class CheckContactAuthFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
didBulkUpdateContactsWithAssignments.append(assignments)
diff --git a/Examples/xx-messenger/Tests/ConfirmRequestFeatureTests/ConfirmRequestFeatureTests.swift b/Examples/xx-messenger/Tests/ConfirmRequestFeatureTests/ConfirmRequestFeatureTests.swift
index 8dea06e119b266534d4b5c6919023ce69789a762..bc84224a8671219aeb7dbed33f5f8552b3302d59 100644
--- a/Examples/xx-messenger/Tests/ConfirmRequestFeatureTests/ConfirmRequestFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/ConfirmRequestFeatureTests/ConfirmRequestFeatureTests.swift
@@ -34,7 +34,7 @@ final class ConfirmRequestFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
didBulkUpdateContactsWithAssignments.append(assignments)
@@ -91,7 +91,7 @@ final class ConfirmRequestFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
didBulkUpdateContactsWithAssignments.append(assignments)
diff --git a/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift b/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift
index 11bfe8a7743ee597706a25f62a0c8f819aea17a8..feeccc98094da76d1f5ebd21122a4b3214afbcb7 100644
--- a/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift
@@ -27,7 +27,7 @@ final class ContactFeatureTests: XCTestCase {
store.environment.mainQueue = .immediate
store.environment.bgQueue = .immediate
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContactsPublisher.run = { query in
dbDidFetchContacts.append(query)
return dbContactsPublisher.eraseToAnyPublisher()
@@ -80,7 +80,7 @@ final class ContactFeatureTests: XCTestCase {
store.environment.mainQueue = .immediate
store.environment.bgQueue = .immediate
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.saveContact.run = { contact in
dbDidSaveContact.append(contact)
return contact
diff --git a/Examples/xx-messenger/Tests/ContactsFeatureTests/ContactsFeatureTests.swift b/Examples/xx-messenger/Tests/ContactsFeatureTests/ContactsFeatureTests.swift
index ffd3eafee2f6d7216fd3a48bb3c2a63097725147..9b3ac0d080ad8e23b8359ab8b3cf073433bed7d8 100644
--- a/Examples/xx-messenger/Tests/ContactsFeatureTests/ContactsFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/ContactsFeatureTests/ContactsFeatureTests.swift
@@ -33,7 +33,7 @@ final class ContactsFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContactsPublisher.run = { query in
didFetchContacts.append(query)
return contactsPublisher.eraseToAnyPublisher()
diff --git a/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift b/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
index a40f432cf7f02e207010f1a161baefb4082e73da..b172793c5095ca4b8e68d1ab5c5e9cbe1c81fc1a 100644
--- a/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
@@ -344,7 +344,7 @@ final class HomeFeatureTests: XCTestCase {
return e2e
}
store.environment.dbManager.getDB.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
dbDidFetchContacts.append(query)
return [
diff --git a/Examples/xx-messenger/Tests/MyContactFeatureTests/MyContactFeatureTests.swift b/Examples/xx-messenger/Tests/MyContactFeatureTests/MyContactFeatureTests.swift
index 8d5fac94338bfa3e9f6e9b413ef2c016304269fb..0e55329610aeb8b51611cc539447364ba9963d75 100644
--- a/Examples/xx-messenger/Tests/MyContactFeatureTests/MyContactFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/MyContactFeatureTests/MyContactFeatureTests.swift
@@ -32,7 +32,7 @@ final class MyContactFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContactsPublisher.run = { query in
dbDidFetchContacts.append(query)
return dbContactsPublisher.eraseToAnyPublisher()
@@ -177,7 +177,7 @@ final class MyContactFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return [dbContact]
@@ -290,7 +290,7 @@ final class MyContactFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return [dbContact]
@@ -469,7 +469,7 @@ final class MyContactFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return [dbContact]
@@ -582,7 +582,7 @@ final class MyContactFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return [dbContact]
@@ -679,7 +679,7 @@ final class MyContactFeatureTests: XCTestCase {
return ud
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContacts.run = { query in
didFetchContacts.append(query)
return [dbContact]
diff --git a/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift b/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift
index 8da1e1f15eb79dccd3f05c0a9ea656ede51d4a35..b156335b3de889ad21d9819e483fc5e27ef7c6ed 100644
--- a/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift
@@ -42,7 +42,7 @@ final class RegisterFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.saveContact.run = { contact in
dbDidSaveContact.append(contact)
return contact
@@ -124,7 +124,7 @@ final class RegisterFeatureTests: XCTestCase {
store.environment.mainQueue = mainQueue.eraseToAnyScheduler()
store.environment.bgQueue = bgQueue.eraseToAnyScheduler()
- store.environment.db.run = { .failing }
+ store.environment.db.run = { .unimplemented }
store.environment.messenger.register.run = { _ in throw error }
store.send(.registerTapped) {
diff --git a/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift b/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift
index 3f35d3dfb2a6488ae2281eff7d1e468d0d0d8f8a..9b15f6cd39884e45f7214875ba586cbb0e2b7712 100644
--- a/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift
@@ -31,7 +31,7 @@ final class SendRequestFeatureTests: XCTestCase {
return e2e
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.fetchContactsPublisher.run = { query in
dbDidFetchContacts.append(query)
return dbContactsPublisher.eraseToAnyPublisher()
@@ -94,7 +94,7 @@ final class SendRequestFeatureTests: XCTestCase {
store.environment.mainQueue = .immediate
store.environment.bgQueue = .immediate
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContacts.append(.init(query: query, assignments: assignments))
return 0
@@ -164,7 +164,7 @@ final class SendRequestFeatureTests: XCTestCase {
store.environment.mainQueue = .immediate
store.environment.bgQueue = .immediate
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { _, _ in return 0 }
return db
}
diff --git a/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactFeatureTests.swift b/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactFeatureTests.swift
index 97f8b428e53ffc63ae123bf9f8510594cc0f5daf..ceaa61cc3f215234aea66381b4c7dc17965bb1a4 100644
--- a/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactFeatureTests.swift
@@ -30,7 +30,7 @@ final class VerifyContactFeatureTests: XCTestCase {
return true
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
didBulkUpdateContactsWithAssignments.append(assignments)
@@ -84,7 +84,7 @@ final class VerifyContactFeatureTests: XCTestCase {
return false
}
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
didBulkUpdateContactsWithAssignments.append(assignments)
@@ -137,7 +137,7 @@ final class VerifyContactFeatureTests: XCTestCase {
store.environment.bgQueue = .immediate
store.environment.messenger.verifyContact.run = { _ in throw error }
store.environment.db.run = {
- var db: Database = .failing
+ var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
didBulkUpdateContactsWithAssignments.append(assignments)
diff --git a/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 0407c096921c2a803d4776a42c53ab56a275507a..d2f6fd9f7aec402d6406f317e572b620eca923c7 100644
--- a/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Examples/xx-messenger/XXMessenger.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://git.xx.network/elixxir/client-ios-db.git",
"state" : {
- "revision" : "f8e3e0088de8301d6c4816e12f0aca1d6f02a280",
- "version" : "1.1.0"
+ "revision" : "16480177beaa6bc80a1c6be25812abd9bcb850ea",
+ "version" : "1.2.0"
}
},
{
@@ -23,8 +23,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/groue/GRDB.swift",
"state" : {
- "revision" : "dd7e7f39e8e4d7a22d258d9809a882f914690b01",
- "version" : "5.26.1"
+ "revision" : "0ac435744a4c67c4ec23a4a671c0d53ce1fee7c6",
+ "version" : "6.0.0"
}
},
{