From ee10b2469b93126b9031b6fcd8be5c5e13b0fa27 Mon Sep 17 00:00:00 2001 From: sashei Date: Mon, 13 May 2019 11:51:05 -0700 Subject: [PATCH 1/2] point to app-services --- Cartfile | 2 +- Cartfile.resolved | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index aef0eae24..8eae78a63 100644 --- a/Cartfile +++ b/Cartfile @@ -6,7 +6,7 @@ github "RxSwiftCommunity/RxOptional" ~> 3.1.3 github "mozilla-mobile/telemetry-ios" github "jrendel/SwiftKeychainWrapper" ~> 3.0 github "mozilla-mobile/MappaMundi" "master" -github "garvankeeley/application-services" "0.27.0.1" # for xcode 10.2 compat use this fork temporarily +github "mozilla/application-services" "v0.27.2" github "adjust/ios_sdk" ~> 4.14.1 github "getsentry/sentry-cocoa" "4.1.0" github "ashleymills/Reachability.swift" "v4.3.0" diff --git a/Cartfile.resolved b/Cartfile.resolved index d0af07854..de10bbb53 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -6,8 +6,8 @@ github "RxSwiftCommunity/RxOptional" "3.7.0" github "adjust/ios_sdk" "v4.17.2" github "apple/swift-protobuf" "1.5.0" github "ashleymills/Reachability.swift" "v4.3.0" -github "garvankeeley/application-services" "0.27.0.1" github "getsentry/sentry-cocoa" "4.1.0" -github "jrendel/SwiftKeychainWrapper" "3.2.0" -github "mozilla-mobile/MappaMundi" "03f0783269c86e0dbd3a2471c6a37c9bf8aaa64e" +github "jrendel/SwiftKeychainWrapper" "3.3.0" +github "mozilla-mobile/MappaMundi" "4341a2cf9f46b62857df0933cfa4405050b6a77b" github "mozilla-mobile/telemetry-ios" "1.1.1" +github "mozilla/application-services" "v0.27.2" From 8c6029a55c4ddbc6c0dce9b691634f2d4eda744b Mon Sep 17 00:00:00 2001 From: sashei Date: Mon, 13 May 2019 13:22:33 -0700 Subject: [PATCH 2/2] fix recently used uispecs --- LockboxXCUITests/LockboxXCUITests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LockboxXCUITests/LockboxXCUITests.swift b/LockboxXCUITests/LockboxXCUITests.swift index fdc52909e..0516d2985 100644 --- a/LockboxXCUITests/LockboxXCUITests.swift +++ b/LockboxXCUITests/LockboxXCUITests.swift @@ -109,7 +109,7 @@ class LockboxXCUITests: BaseTestCase { } func testEntriesSortAndSearch() { - let firstEntryRecentOrder = "bmo.com" + let firstEntryRecentOrder = "arncyvuzox.co.uk" let firstEntryAphabeticallyOrder = "accounts.firefox.com" loginToEntryListView()