diff --git a/ImageClassification.xcodeproj/project.pbxproj b/ImageClassification.xcodeproj/project.pbxproj index 26f48fb1..423111e7 100644 --- a/ImageClassification.xcodeproj/project.pbxproj +++ b/ImageClassification.xcodeproj/project.pbxproj @@ -217,7 +217,6 @@ isa = PBXGroup; children = ( 602A2224245529AC00800829 /* SpeechToTextVCTest.swift */, - 6E045A8A24560A8400C4E53C /* 1FirstTest.swift */, 602A22222455299A00800829 /* iASLUITests.swift */, 67ABF91E24301C1C00881646 /* Info.plist */, 67ABF92524301CCE00881646 /* ASLKeyboardUITests.swift */, @@ -596,9 +595,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6E045A892455EB8C00C4E53C /* SpeechToTextVCTest.swift in Sources */, 606C60D2244AC7810090A4AC /* ChatVCUITests.swift in Sources */, - 6E045A8B24560A8400C4E53C /* 1FirstTest.swift in Sources */, 606C60D4244ACCE80090A4AC /* LoginVCUITests.swift in Sources */, 6EF769D8244B75AF00462E31 /* ViewControllerUITests.swift in Sources */, 67ABF92624301CCE00881646 /* ASLKeyboardUITests.swift in Sources */, diff --git a/ImageClassification/AppDelegate.swift b/ImageClassification/AppDelegate.swift index d337e9f5..5e137c66 100644 --- a/ImageClassification/AppDelegate.swift +++ b/ImageClassification/AppDelegate.swift @@ -121,6 +121,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD self.window?.makeKeyAndVisible() + // if CommandLine.arguments.contains("--MonkeyPaws") { // paws = MonkeyPaws(view: window!) // } diff --git a/Podfile b/Podfile index c090d693..47655169 100644 --- a/Podfile +++ b/Podfile @@ -20,7 +20,7 @@ target 'ImageClassification' do pod 'Firebase/Messaging' pod 'SwiftLint' pod 'SwiftMonkeyPaws', '~> 2.1.0' - pod 'AppleWelcomeScreen' + pod 'AppleWelcomeScreen','~> 1.0.1' pod 'YouTubePlayer', :git => 'https://github.com/weakfl/Swift-YouTube-Player.git', :branch => 'use-wkwebview' # replace with original pod after the pull request got merged # pod 'SwiftVideoRecorder',:git => 'https://github.com/ApplebaumIan/swift-video-recorder.git', :branch => 'master' pod "SwiftyCam" diff --git a/Podfile.lock b/Podfile.lock index 1c1e424e..1800ce5c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,140 +1,194 @@ PODS: - - abseil/algorithm (0.20190808): - - abseil/algorithm/algorithm (= 0.20190808) - - abseil/algorithm/container (= 0.20190808) - - abseil/algorithm/algorithm (0.20190808) - - abseil/algorithm/container (0.20190808): + - abseil/algorithm (0.20200225.0): + - abseil/algorithm/algorithm (= 0.20200225.0) + - abseil/algorithm/container (= 0.20200225.0) + - abseil/algorithm/algorithm (0.20200225.0): + - abseil/base/config + - abseil/algorithm/container (0.20200225.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/meta/type_traits - - abseil/base (0.20190808): - - abseil/base/atomic_hook (= 0.20190808) - - abseil/base/base (= 0.20190808) - - abseil/base/base_internal (= 0.20190808) - - abseil/base/bits (= 0.20190808) - - abseil/base/config (= 0.20190808) - - abseil/base/core_headers (= 0.20190808) - - abseil/base/dynamic_annotations (= 0.20190808) - - abseil/base/endian (= 0.20190808) - - abseil/base/log_severity (= 0.20190808) - - abseil/base/malloc_internal (= 0.20190808) - - abseil/base/pretty_function (= 0.20190808) - - abseil/base/spinlock_wait (= 0.20190808) - - abseil/base/throw_delegate (= 0.20190808) - - abseil/base/atomic_hook (0.20190808) - - abseil/base/base (0.20190808): + - abseil/base (0.20200225.0): + - abseil/base/atomic_hook (= 0.20200225.0) + - abseil/base/base (= 0.20200225.0) + - abseil/base/base_internal (= 0.20200225.0) + - abseil/base/bits (= 0.20200225.0) + - abseil/base/config (= 0.20200225.0) + - abseil/base/core_headers (= 0.20200225.0) + - abseil/base/dynamic_annotations (= 0.20200225.0) + - abseil/base/endian (= 0.20200225.0) + - abseil/base/errno_saver (= 0.20200225.0) + - abseil/base/exponential_biased (= 0.20200225.0) + - abseil/base/log_severity (= 0.20200225.0) + - abseil/base/malloc_internal (= 0.20200225.0) + - abseil/base/periodic_sampler (= 0.20200225.0) + - abseil/base/pretty_function (= 0.20200225.0) + - abseil/base/raw_logging_internal (= 0.20200225.0) + - abseil/base/spinlock_wait (= 0.20200225.0) + - abseil/base/throw_delegate (= 0.20200225.0) + - abseil/base/atomic_hook (0.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/base (0.20200225.0): - abseil/base/atomic_hook - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - abseil/base/log_severity + - abseil/base/raw_logging_internal - abseil/base/spinlock_wait - abseil/meta/type_traits - - abseil/base/base_internal (0.20190808): + - abseil/base/base_internal (0.20200225.0): + - abseil/base/config - abseil/meta/type_traits - - abseil/base/bits (0.20190808): + - abseil/base/bits (0.20200225.0): + - abseil/base/config - abseil/base/core_headers - - abseil/base/config (0.20190808) - - abseil/base/core_headers (0.20190808): + - abseil/base/config (0.20200225.0) + - abseil/base/core_headers (0.20200225.0): - abseil/base/config - - abseil/base/dynamic_annotations (0.20190808) - - abseil/base/endian (0.20190808): + - abseil/base/dynamic_annotations (0.20200225.0) + - abseil/base/endian (0.20200225.0): - abseil/base/config - abseil/base/core_headers - - abseil/base/log_severity (0.20190808): + - abseil/base/errno_saver (0.20200225.0): + - abseil/base/config + - abseil/base/exponential_biased (0.20200225.0): + - abseil/base/config - abseil/base/core_headers - - abseil/base/malloc_internal (0.20190808): + - abseil/base/log_severity (0.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/malloc_internal (0.20200225.0): - abseil/base/base + - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/base/dynamic_annotations - - abseil/base/spinlock_wait - - abseil/base/pretty_function (0.20190808) - - abseil/base/spinlock_wait (0.20190808): + - abseil/base/raw_logging_internal + - abseil/base/periodic_sampler (0.20200225.0): - abseil/base/core_headers - - abseil/base/throw_delegate (0.20190808): - - abseil/base/base + - abseil/base/exponential_biased + - abseil/base/pretty_function (0.20200225.0) + - abseil/base/raw_logging_internal (0.20200225.0): + - abseil/base/atomic_hook - abseil/base/config - - abseil/memory (0.20190808): - - abseil/memory/memory (= 0.20190808) - - abseil/memory/memory (0.20190808): + - abseil/base/core_headers + - abseil/base/log_severity + - abseil/base/spinlock_wait (0.20200225.0): + - abseil/base/base_internal + - abseil/base/core_headers + - abseil/base/errno_saver + - abseil/base/throw_delegate (0.20200225.0): + - abseil/base/config + - abseil/base/raw_logging_internal + - abseil/container/compressed_tuple (0.20200225.0): + - abseil/utility/utility + - abseil/container/inlined_vector (0.20200225.0): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/base/throw_delegate + - abseil/container/inlined_vector_internal + - abseil/memory/memory + - abseil/container/inlined_vector_internal (0.20200225.0): + - abseil/base/core_headers + - abseil/container/compressed_tuple + - abseil/memory/memory + - abseil/meta/type_traits + - abseil/types/span + - abseil/memory (0.20200225.0): + - abseil/memory/memory (= 0.20200225.0) + - abseil/memory/memory (0.20200225.0): - abseil/base/core_headers - abseil/meta/type_traits - - abseil/meta (0.20190808): - - abseil/meta/type_traits (= 0.20190808) - - abseil/meta/type_traits (0.20190808): + - abseil/meta (0.20200225.0): + - abseil/meta/type_traits (= 0.20200225.0) + - abseil/meta/type_traits (0.20200225.0): - abseil/base/config - - abseil/numeric/int128 (0.20190808): + - abseil/numeric/int128 (0.20200225.0): - abseil/base/config - abseil/base/core_headers - - abseil/strings/internal (0.20190808): + - abseil/strings/internal (0.20200225.0): + - abseil/base/config - abseil/base/core_headers - abseil/base/endian + - abseil/base/raw_logging_internal - abseil/meta/type_traits - - abseil/strings/strings (0.20190808): + - abseil/strings/str_format (0.20200225.0): + - abseil/strings/str_format_internal + - abseil/strings/str_format_internal (0.20200225.0): + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/numeric/int128 + - abseil/strings/strings + - abseil/types/span + - abseil/strings/strings (0.20200225.0): - abseil/base/base - abseil/base/bits - abseil/base/config - abseil/base/core_headers - abseil/base/endian + - abseil/base/raw_logging_internal - abseil/base/throw_delegate - abseil/memory/memory - abseil/meta/type_traits - abseil/numeric/int128 - abseil/strings/internal - - abseil/time (0.20190808): - - abseil/time/internal (= 0.20190808) - - abseil/time/time (= 0.20190808) - - abseil/time/internal (0.20190808): - - abseil/time/internal/cctz (= 0.20190808) - - abseil/time/internal/cctz (0.20190808): - - abseil/time/internal/cctz/civil_time (= 0.20190808) - - abseil/time/internal/cctz/includes (= 0.20190808) - - abseil/time/internal/cctz/time_zone (= 0.20190808) - - abseil/time/internal/cctz/civil_time (0.20190808) - - abseil/time/internal/cctz/includes (0.20190808) - - abseil/time/internal/cctz/time_zone (0.20190808): + - abseil/time (0.20200225.0): + - abseil/time/internal (= 0.20200225.0) + - abseil/time/time (= 0.20200225.0) + - abseil/time/internal (0.20200225.0): + - abseil/time/internal/cctz (= 0.20200225.0) + - abseil/time/internal/cctz (0.20200225.0): + - abseil/time/internal/cctz/civil_time (= 0.20200225.0) + - abseil/time/internal/cctz/time_zone (= 0.20200225.0) + - abseil/time/internal/cctz/civil_time (0.20200225.0): + - abseil/base/config + - abseil/time/internal/cctz/time_zone (0.20200225.0): + - abseil/base/config - abseil/time/internal/cctz/civil_time - - abseil/time/time (0.20190808): + - abseil/time/time (0.20200225.0): - abseil/base/base - abseil/base/core_headers + - abseil/base/raw_logging_internal - abseil/numeric/int128 - abseil/strings/strings - abseil/time/internal/cctz/civil_time - abseil/time/internal/cctz/time_zone - - abseil/types (0.20190808): - - abseil/types/any (= 0.20190808) - - abseil/types/bad_any_cast (= 0.20190808) - - abseil/types/bad_any_cast_impl (= 0.20190808) - - abseil/types/bad_optional_access (= 0.20190808) - - abseil/types/bad_variant_access (= 0.20190808) - - abseil/types/compare (= 0.20190808) - - abseil/types/optional (= 0.20190808) - - abseil/types/span (= 0.20190808) - - abseil/types/variant (= 0.20190808) - - abseil/types/any (0.20190808): + - abseil/types (0.20200225.0): + - abseil/types/any (= 0.20200225.0) + - abseil/types/bad_any_cast (= 0.20200225.0) + - abseil/types/bad_any_cast_impl (= 0.20200225.0) + - abseil/types/bad_optional_access (= 0.20200225.0) + - abseil/types/bad_variant_access (= 0.20200225.0) + - abseil/types/compare (= 0.20200225.0) + - abseil/types/optional (= 0.20200225.0) + - abseil/types/span (= 0.20200225.0) + - abseil/types/variant (= 0.20200225.0) + - abseil/types/any (0.20200225.0): - abseil/base/config - abseil/base/core_headers - abseil/meta/type_traits - abseil/types/bad_any_cast - abseil/utility/utility - - abseil/types/bad_any_cast (0.20190808): + - abseil/types/bad_any_cast (0.20200225.0): - abseil/base/config - abseil/types/bad_any_cast_impl - - abseil/types/bad_any_cast_impl (0.20190808): - - abseil/base/base + - abseil/types/bad_any_cast_impl (0.20200225.0): - abseil/base/config - - abseil/types/bad_optional_access (0.20190808): - - abseil/base/base + - abseil/base/raw_logging_internal + - abseil/types/bad_optional_access (0.20200225.0): - abseil/base/config - - abseil/types/bad_variant_access (0.20190808): - - abseil/base/base + - abseil/base/raw_logging_internal + - abseil/types/bad_variant_access (0.20200225.0): - abseil/base/config - - abseil/types/compare (0.20190808): + - abseil/base/raw_logging_internal + - abseil/types/compare (0.20200225.0): - abseil/base/core_headers - abseil/meta/type_traits - - abseil/types/optional (0.20190808): + - abseil/types/optional (0.20200225.0): - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers @@ -142,185 +196,188 @@ PODS: - abseil/meta/type_traits - abseil/types/bad_optional_access - abseil/utility/utility - - abseil/types/span (0.20190808): + - abseil/types/span (0.20200225.0): - abseil/algorithm/algorithm - abseil/base/core_headers - abseil/base/throw_delegate - abseil/meta/type_traits - - abseil/types/variant (0.20190808): + - abseil/types/variant (0.20200225.0): - abseil/base/base_internal - abseil/base/config - abseil/base/core_headers - abseil/meta/type_traits - abseil/types/bad_variant_access - abseil/utility/utility - - abseil/utility/utility (0.20190808): + - abseil/utility/utility (0.20200225.0): - abseil/base/base_internal - abseil/base/config - abseil/meta/type_traits - AppleWelcomeScreen (1.0.2): - SnapKit - - BoringSSL-GRPC (0.0.3): - - BoringSSL-GRPC/Implementation (= 0.0.3) - - BoringSSL-GRPC/Interface (= 0.0.3) - - BoringSSL-GRPC/Implementation (0.0.3): - - BoringSSL-GRPC/Interface (= 0.0.3) - - BoringSSL-GRPC/Interface (0.0.3) - - Firebase (6.22.0): - - Firebase/Core (= 6.22.0) - - Firebase/Analytics (6.22.0): + - BoringSSL-GRPC (0.0.7): + - BoringSSL-GRPC/Implementation (= 0.0.7) + - BoringSSL-GRPC/Interface (= 0.0.7) + - BoringSSL-GRPC/Implementation (0.0.7): + - BoringSSL-GRPC/Interface (= 0.0.7) + - BoringSSL-GRPC/Interface (0.0.7) + - Firebase (6.34.0): + - Firebase/Core (= 6.34.0) + - Firebase/Analytics (6.34.0): - Firebase/Core - - Firebase/Auth (6.22.0): + - Firebase/Auth (6.34.0): - Firebase/CoreOnly - - FirebaseAuth (~> 6.5.1) - - Firebase/Core (6.22.0): + - FirebaseAuth (~> 6.9.2) + - Firebase/Core (6.34.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 6.4.1) - - Firebase/CoreOnly (6.22.0): - - FirebaseCore (= 6.6.6) - - Firebase/Database (6.22.0): + - FirebaseAnalytics (= 6.9.0) + - Firebase/CoreOnly (6.34.0): + - FirebaseCore (= 6.10.4) + - Firebase/Database (6.34.0): - Firebase/CoreOnly - - FirebaseDatabase (~> 6.1.4) - - Firebase/Firestore (6.22.0): + - FirebaseDatabase (~> 6.6.0) + - Firebase/Firestore (6.34.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 1.12.0) - - Firebase/Messaging (6.22.0): + - FirebaseFirestore (~> 1.19.0) + - Firebase/Messaging (6.34.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 4.3.0) - - FirebaseAnalytics (6.4.1): - - FirebaseCore (~> 6.6) - - FirebaseInstallations (~> 1.1) - - GoogleAppMeasurement (= 6.4.1) - - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - - GoogleUtilities/MethodSwizzler (~> 6.0) - - GoogleUtilities/Network (~> 6.0) - - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (= 0.3.9011) - - FirebaseAnalyticsInterop (1.5.0) - - FirebaseAuth (6.5.1): - - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 6.6) - - GoogleUtilities/AppDelegateSwizzler (~> 6.5) - - GoogleUtilities/Environment (~> 6.5) + - FirebaseMessaging (~> 4.7.1) + - FirebaseAnalytics (6.9.0): + - FirebaseCore (~> 6.10) + - FirebaseInstallations (~> 1.7) + - GoogleAppMeasurement (= 6.9.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.7) + - GoogleUtilities/MethodSwizzler (~> 6.7) + - GoogleUtilities/Network (~> 6.7) + - "GoogleUtilities/NSData+zlib (~> 6.7)" + - nanopb (~> 1.30906.0) + - FirebaseAuth (6.9.2): + - FirebaseCore (~> 6.10) + - GoogleUtilities/AppDelegateSwizzler (~> 6.7) + - GoogleUtilities/Environment (~> 6.7) - GTMSessionFetcher/Core (~> 1.1) - - FirebaseAuthInterop (1.1.0) - - FirebaseCore (6.6.6): - - FirebaseCoreDiagnostics (~> 1.2) - - FirebaseCoreDiagnosticsInterop (~> 1.2) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/Logger (~> 6.5) - - FirebaseCoreDiagnostics (1.2.3): - - FirebaseCoreDiagnosticsInterop (~> 1.2) - - GoogleDataTransportCCTSupport (~> 2.0) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/Logger (~> 6.5) - - nanopb (~> 0.3.901) - - FirebaseCoreDiagnosticsInterop (1.2.0) - - FirebaseDatabase (6.1.4): - - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 6.0) + - FirebaseCore (6.10.4): + - FirebaseCoreDiagnostics (~> 1.6) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/Logger (~> 6.7) + - FirebaseCoreDiagnostics (1.7.0): + - GoogleDataTransport (~> 7.4) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/Logger (~> 6.7) + - nanopb (~> 1.30906.0) + - FirebaseDatabase (6.6.0): + - FirebaseCore (~> 6.10) - leveldb-library (~> 1.22) - - FirebaseFirestore (1.12.0): - - abseil/algorithm (= 0.20190808) - - abseil/base (= 0.20190808) - - abseil/memory (= 0.20190808) - - abseil/meta (= 0.20190808) - - abseil/strings/strings (= 0.20190808) - - abseil/time (= 0.20190808) - - abseil/types (= 0.20190808) - - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 6.2) - - "gRPC-C++ (= 0.0.9)" + - FirebaseFirestore (1.19.0): + - abseil/algorithm (= 0.20200225.0) + - abseil/base (= 0.20200225.0) + - abseil/memory (= 0.20200225.0) + - abseil/meta (= 0.20200225.0) + - abseil/strings/strings (= 0.20200225.0) + - abseil/time (= 0.20200225.0) + - abseil/types (= 0.20200225.0) + - FirebaseCore (~> 6.10) + - "gRPC-C++ (~> 1.28.0)" - leveldb-library (~> 1.22) - - nanopb (~> 0.3.901) - - FirebaseFirestoreSwift (0.2): + - nanopb (~> 1.30906.0) + - FirebaseFirestoreSwift (0.4.0): - FirebaseFirestore (>= 1.6.1, ~> 1.6) - - FirebaseInstallations (1.1.1): - - FirebaseCore (~> 6.6) - - GoogleUtilities/UserDefaults (~> 6.5) + - FirebaseInstallations (1.7.0): + - FirebaseCore (~> 6.10) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/UserDefaults (~> 6.7) - PromisesObjC (~> 1.2) - - FirebaseInstanceID (4.3.3): - - FirebaseCore (~> 6.6) - - FirebaseInstallations (~> 1.0) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/UserDefaults (~> 6.5) - - FirebaseMessaging (4.3.0): - - FirebaseAnalyticsInterop (~> 1.5) - - FirebaseCore (~> 6.6) - - FirebaseInstanceID (~> 4.3) - - GoogleUtilities/AppDelegateSwizzler (~> 6.5) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/Reachability (~> 6.5) - - GoogleUtilities/UserDefaults (~> 6.5) + - FirebaseInstanceID (4.8.0): + - FirebaseCore (~> 6.10) + - FirebaseInstallations (~> 1.6) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/UserDefaults (~> 6.7) + - FirebaseMessaging (4.7.1): + - FirebaseCore (~> 6.10) + - FirebaseInstanceID (~> 4.7) + - GoogleUtilities/AppDelegateSwizzler (~> 6.7) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/Reachability (~> 6.7) + - GoogleUtilities/UserDefaults (~> 6.7) - Protobuf (>= 3.9.2, ~> 3.9) - - GoogleAppMeasurement (6.4.1): - - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - - GoogleUtilities/MethodSwizzler (~> 6.0) - - GoogleUtilities/Network (~> 6.0) - - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (= 0.3.9011) - - GoogleDataTransport (5.1.1) - - GoogleDataTransportCCTSupport (2.0.2): - - GoogleDataTransport (~> 5.1) - - nanopb (~> 0.3.901) - - GoogleUtilities/AppDelegateSwizzler (6.5.2): + - GoogleAppMeasurement (6.9.0): + - GoogleUtilities/AppDelegateSwizzler (~> 6.7) + - GoogleUtilities/MethodSwizzler (~> 6.7) + - GoogleUtilities/Network (~> 6.7) + - "GoogleUtilities/NSData+zlib (~> 6.7)" + - nanopb (~> 1.30906.0) + - GoogleDataTransport (7.5.1): + - nanopb (~> 1.30906.0) + - GoogleUtilities/AppDelegateSwizzler (6.7.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.5.2) - - GoogleUtilities/Logger (6.5.2): + - GoogleUtilities/Environment (6.7.2): + - PromisesObjC (~> 1.2) + - GoogleUtilities/Logger (6.7.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.5.2): + - GoogleUtilities/MethodSwizzler (6.7.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.5.2): + - GoogleUtilities/Network (6.7.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.5.2)" - - GoogleUtilities/Reachability (6.5.2): + - "GoogleUtilities/NSData+zlib (6.7.2)" + - GoogleUtilities/Reachability (6.7.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.5.2): + - GoogleUtilities/UserDefaults (6.7.2): - GoogleUtilities/Logger - - "gRPC-C++ (0.0.9)": - - "gRPC-C++/Implementation (= 0.0.9)" - - "gRPC-C++/Interface (= 0.0.9)" - - "gRPC-C++/Implementation (0.0.9)": - - "gRPC-C++/Interface (= 0.0.9)" - - gRPC-Core (= 1.21.0) - - nanopb (~> 0.3) - - "gRPC-C++/Interface (0.0.9)" - - gRPC-Core (1.21.0): - - gRPC-Core/Implementation (= 1.21.0) - - gRPC-Core/Interface (= 1.21.0) - - gRPC-Core/Implementation (1.21.0): - - BoringSSL-GRPC (= 0.0.3) - - gRPC-Core/Interface (= 1.21.0) - - nanopb (~> 0.3) - - gRPC-Core/Interface (1.21.0) - - GTMSessionFetcher/Core (1.3.1) + - "gRPC-C++ (1.28.2)": + - "gRPC-C++/Implementation (= 1.28.2)" + - "gRPC-C++/Interface (= 1.28.2)" + - "gRPC-C++/Implementation (1.28.2)": + - abseil/container/inlined_vector (= 0.20200225.0) + - abseil/memory/memory (= 0.20200225.0) + - abseil/strings/str_format (= 0.20200225.0) + - abseil/strings/strings (= 0.20200225.0) + - abseil/types/optional (= 0.20200225.0) + - "gRPC-C++/Interface (= 1.28.2)" + - gRPC-Core (= 1.28.2) + - "gRPC-C++/Interface (1.28.2)" + - gRPC-Core (1.28.2): + - gRPC-Core/Implementation (= 1.28.2) + - gRPC-Core/Interface (= 1.28.2) + - gRPC-Core/Implementation (1.28.2): + - abseil/container/inlined_vector (= 0.20200225.0) + - abseil/memory/memory (= 0.20200225.0) + - abseil/strings/str_format (= 0.20200225.0) + - abseil/strings/strings (= 0.20200225.0) + - abseil/types/optional (= 0.20200225.0) + - BoringSSL-GRPC (= 0.0.7) + - gRPC-Core/Interface (= 1.28.2) + - gRPC-Core/Interface (1.28.2) + - GTMSessionFetcher/Core (1.5.0) - KeychainSwift (19.0.0) - KMPlaceholderTextView (1.4.0) - leveldb-library (1.22) - - nanopb (0.3.9011): - - nanopb/decode (= 0.3.9011) - - nanopb/encode (= 0.3.9011) - - nanopb/decode (0.3.9011) - - nanopb/encode (0.3.9011) - - PromisesObjC (1.2.8) - - Protobuf (3.11.4) + - nanopb (1.30906.0): + - nanopb/decode (= 1.30906.0) + - nanopb/encode (= 1.30906.0) + - nanopb/decode (1.30906.0) + - nanopb/encode (1.30906.0) + - PromisesObjC (1.2.11) + - Protobuf (3.14.0) - SnapKit (5.0.1) - - SwiftLint (0.39.2) + - SwiftLint (0.41.0) - SwiftMonkey (2.1.1) - SwiftMonkeyPaws (2.1.1) - SwiftyCam (4.0.0) - - TensorFlowLiteC (2.1.0) - - TensorFlowLiteSwift (2.1.0): - - TensorFlowLiteC (= 2.1.0) + - TensorFlowLiteC (2.3.0): + - TensorFlowLiteC/Core (= 2.3.0) + - TensorFlowLiteC/Core (2.3.0) + - TensorFlowLiteSwift (2.3.0): + - TensorFlowLiteSwift/Core (= 2.3.0) + - TensorFlowLiteSwift/Core (2.3.0): + - TensorFlowLiteC (= 2.3.0) - YouTubePlayer (0.5.0) - Zip (1.1.0) DEPENDENCIES: - - AppleWelcomeScreen + - AppleWelcomeScreen (~> 1.0.1) - Firebase - Firebase/Analytics - Firebase/Auth @@ -346,12 +403,9 @@ SPEC REPOS: - BoringSSL-GRPC - Firebase - FirebaseAnalytics - - FirebaseAnalyticsInterop - FirebaseAuth - - FirebaseAuthInterop - FirebaseCore - FirebaseCoreDiagnostics - - FirebaseCoreDiagnosticsInterop - FirebaseDatabase - FirebaseFirestore - FirebaseFirestoreSwift @@ -360,7 +414,6 @@ SPEC REPOS: - FirebaseMessaging - GoogleAppMeasurement - GoogleDataTransport - - GoogleDataTransportCCTSupport - GoogleUtilities - "gRPC-C++" - gRPC-Core @@ -391,46 +444,42 @@ CHECKOUT OPTIONS: :git: https://github.com/weakfl/Swift-YouTube-Player.git SPEC CHECKSUMS: - abseil: 18063d773f5366ff8736a050fe035a28f635fd27 + abseil: 6c8eb7892aefa08d929b39f9bb108e5367e3228f AppleWelcomeScreen: 92fb44fc457df8fdc2af00e29546ef280571611f - BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318 - Firebase: 32f9520684e87c7af3f0704f7f88042626d6b536 - FirebaseAnalytics: 83f822fd0d33a46f49f89b8c3ab16ab4d89df08a - FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae - FirebaseAuth: a6da11d78dfd956b7f7af3222a0f0b1c93ef8fc9 - FirebaseAuthInterop: a0f37ae05833af156e72028f648d313f7e7592e9 - FirebaseCore: 9aca0f1fffb405176ba15311a5621fcde4106fcf - FirebaseCoreDiagnostics: 13a6564cd6d5375066bbc8940cc1753af24497f3 - FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850 - FirebaseDatabase: 0144e0706a4761f1b0e8679572eba8095ddb59be - FirebaseFirestore: a750487e2019ac35464c78311dcf2fde9d817c52 - FirebaseFirestoreSwift: 0437bb10d83f8161a9131da1739998254c78fdf5 - FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44 - FirebaseInstanceID: 4b87a9a75ef628a53bb5de46e4d4cecfcce88c02 - FirebaseMessaging: 4ec33842d36b3319e062e51fb8b35a74f726950d - GoogleAppMeasurement: e49be3954045b17d046f271b9cc1ec052bad9702 - GoogleDataTransport: 6ffa4dd0b6d547f8d27b91bd92fa9e197a3f5f1f - GoogleDataTransportCCTSupport: 12f02e5c8f09c055615de90bcd5ba2c375546051 - GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e - "gRPC-C++": 9dfe7b44821e7b3e44aacad2af29d2c21f7cde83 - gRPC-Core: c9aef9a261a1247e881b18059b84d597293c9947 - GTMSessionFetcher: cea130bbfe5a7edc8d06d3f0d17288c32ffe9925 + BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879 + Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999 + FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f + FirebaseAuth: c92d49ada7948d1a23466e3db17bc4c2039dddc3 + FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec + FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1 + FirebaseDatabase: 13a865a4b85897462b930eb683bda8f52583713f + FirebaseFirestore: 9b2f1b9b9a6f2f0b6fb7484b9e32ab7e39243554 + FirebaseFirestoreSwift: 2c46dbc1156db97dc4f6dd798d4f5b57b9c7fab6 + FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2 + FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1 + FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a + GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e + GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833 + GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 + "gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2 + gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5 + GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52 KeychainSwift: a06190cf933ad46b1e0abc3d77d29c06331715c7 KMPlaceholderTextView: 2206c3df39979e9396e2d96fa9f427a8951121b0 leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 - nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd - PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6 - Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7 + nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc + PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f + Protobuf: 0cde852566359049847168e51bd1c690e0f70056 SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb - SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447 + SwiftLint: c585ebd615d9520d7fbdbe151f527977b0534f1e SwiftMonkey: aea6f2707a4b7ab5277b4d2fd2f0723a083997b1 SwiftMonkeyPaws: 655524bb402df5ac2be836f9f604aca1068fbde6 SwiftyCam: 6e57914771d972fbe508e759dc9d0150a44a93fd - TensorFlowLiteC: 215603d4426d93810eace5947e317389554a4b66 - TensorFlowLiteSwift: 9d8137f18d5ac30ca89bba4fbe118e0949ac5743 + TensorFlowLiteC: 51f50caf5777f740a70e2c1a5dbdc149e7aeb50b + TensorFlowLiteSwift: fb152cc1eec36b25b03a23c07f5d58113170af58 YouTubePlayer: c9581f0405e3240d1549b194bc1134bfc018a51d Zip: 8877eede3dda76bcac281225c20e71c25270774c -PODFILE CHECKSUM: f26b8d126601d1ad611f2fe5743b1128abfcc388 +PODFILE CHECKSUM: 1af63510abe0bb2149150d49a083c7e15e66eaf7 -COCOAPODS: 1.9.1 +COCOAPODS: 1.9.3 diff --git a/iASLUITests/LoginVCUITests.swift b/iASLUITests/LoginVCUITests.swift index 900dabca..ddfa7833 100644 --- a/iASLUITests/LoginVCUITests.swift +++ b/iASLUITests/LoginVCUITests.swift @@ -19,6 +19,25 @@ class LoginVCUITests: XCTestCase { override func setUp() { XCUIApplication().launch() + + var count = 0 + addUIInterruptionMonitor(withDescription: "System Dialog") { (alert) -> Bool in + let okButton = alert.buttons["OK"] + if okButton.exists { + okButton.tap() + count += 1 + } + + let allowButton = alert.buttons["Allow"] + if allowButton.exists { + allowButton.tap() + count += 1 + } + return true + } + + + } override func tearDown() { diff --git a/iASLUITests/NotesVCUITests.swift b/iASLUITests/NotesVCUITests.swift index 79aee5bc..46fbfced 100644 --- a/iASLUITests/NotesVCUITests.swift +++ b/iASLUITests/NotesVCUITests.swift @@ -19,6 +19,24 @@ class NotesVCUITests: XCTestCase { override func setUp() { XCUIApplication().launch() + + var count = 0 + addUIInterruptionMonitor(withDescription: "System Dialog") { (alert) -> Bool in + let okButton = alert.buttons["OK"] + if okButton.exists { + okButton.tap() + count += 1 + } + + let allowButton = alert.buttons["Allow"] + if allowButton.exists { + allowButton.tap() + count += 1 + } + return true + } + + let app = XCUIApplication() app/*@START_MENU_TOKEN@*/.staticTexts["Already a user? Login"]/*[[".buttons[\"Already a user? Login\"].staticTexts[\"Already a user? Login\"]",".staticTexts[\"Already a user? Login\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/.tap() let emailTextField = app.textFields["Email Address"] diff --git a/iASLUITests/RemoteConversationVCUITests.swift b/iASLUITests/RemoteConversationVCUITests.swift index 50bdb426..24d6188f 100644 --- a/iASLUITests/RemoteConversationVCUITests.swift +++ b/iASLUITests/RemoteConversationVCUITests.swift @@ -19,6 +19,23 @@ class RemoteConversationVCUITests: XCTestCase { override func setUp() { XCUIApplication().launch() + + var count = 0 + addUIInterruptionMonitor(withDescription: "System Dialog") { (alert) -> Bool in + let okButton = alert.buttons["OK"] + if okButton.exists { + okButton.tap() + count += 1 + } + + let allowButton = alert.buttons["Allow"] + if allowButton.exists { + allowButton.tap() + count += 1 + } + return true + } + let app = XCUIApplication() app/*@START_MENU_TOKEN@*/.staticTexts["Already a user? Login"]/*[[".buttons[\"Already a user? Login\"].staticTexts[\"Already a user? Login\"]",".staticTexts[\"Already a user? Login\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/.tap() let emailTextField = app.textFields["Email Address"] diff --git a/iASLUITests/ViewControllerUITests.swift b/iASLUITests/ViewControllerUITests.swift index 6ce7ee2c..c97ab5b5 100644 --- a/iASLUITests/ViewControllerUITests.swift +++ b/iASLUITests/ViewControllerUITests.swift @@ -18,19 +18,8 @@ class ViewControllerUITests: XCTestCase { let uid = "ppmK3FXm7gPc6HwhS5wOvBtfLFP2" override func setUp() { + // Put setup code here. This method is called before the invocation of each test method in the class. XCUIApplication().launch() - let app = XCUIApplication() - app/*@START_MENU_TOKEN@*/.staticTexts["Already a user? Login"]/*[[".buttons[\"Already a user? Login\"].staticTexts[\"Already a user? Login\"]",".staticTexts[\"Already a user? Login\"]"],[[[-1,1],[-1,0]]],[0]]@END_MENU_TOKEN@*/.tap() - let emailTextField = app.textFields["Email Address"] - emailTextField.tap() - emailTextField.typeText(email) - - let passwordTextField = app.secureTextFields["Password"] - passwordTextField.tap() - passwordTextField.typeText(password) - - app.buttons["Login"].tap() - sleep(5) } @@ -153,6 +142,7 @@ class ViewControllerUITests: XCTestCase { XCTAssertTrue(nameTextField.exists) + // XCTAssertTrue(emailTextField.exists) // // XCTAssertTrue(passwordTextField.exists)