From ebe221acbbaaed2fab587e5d532d680de941b0c4 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Fri, 19 Jan 2024 20:49:05 -0800 Subject: [PATCH] Remove Disable Autofill and Move to GitHub Action Setup (#66) # Remove Disable Autofill and Move to GitHub Action Setup ## :recycle: Current situation & Problem - https://github.com/StanfordBDHG/XCTestExtensions/pull/18 - https://github.com/StanfordBDHG/.github/pull/47 ## :gear: Release Notes - Remove disable autofill and move to GitHub Action setup ## :pencil: Code of Conduct & Contributing Guidelines By submitting creating this pull request, you agree to follow our [Code of Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md): - [x] I agree to follow the [Code of Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md). --- .github/workflows/build-and-test.yml | 1 + TemplateApplication.xcodeproj/project.pbxproj | 17 ++++--------- .../xcshareddata/swiftpm/Package.resolved | 24 +++++++++---------- .../ContributionsTest.swift | 2 -- .../OnboardingTests.swift | 2 -- fastlane/Fastfile | 4 +--- 6 files changed, 18 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a28fe27..1356856 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -37,6 +37,7 @@ jobs: with: artifactname: TemplateApplication.xcresult runsonlabels: '["macOS", "self-hosted"]' + setupSimulators: true setupfirebaseemulator: true customcommand: "firebase emulators:exec 'fastlane test'" uploadcoveragereport: diff --git a/TemplateApplication.xcodeproj/project.pbxproj b/TemplateApplication.xcodeproj/project.pbxproj index 2ca6636..8b61cba 100644 --- a/TemplateApplication.xcodeproj/project.pbxproj +++ b/TemplateApplication.xcodeproj/project.pbxproj @@ -713,7 +713,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.2; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -751,7 +751,6 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; INFOPLIST_KEY_UITemplateApplicationlicationSceneManifest_Generation = YES; INFOPLIST_KEY_UITemplateApplicationlicationSupportsIndirectInputEvents = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -779,7 +778,6 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 637867499T; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.templateapplication.tests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -798,7 +796,6 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 637867499T; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.templateapplicationuitests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -861,7 +858,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.2; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -918,7 +915,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.2; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -956,7 +953,6 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; INFOPLIST_KEY_UITemplateApplicationlicationSceneManifest_Generation = YES; INFOPLIST_KEY_UITemplateApplicationlicationSupportsIndirectInputEvents = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1004,7 +1000,6 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; INFOPLIST_KEY_UITemplateApplicationlicationSceneManifest_Generation = YES; INFOPLIST_KEY_UITemplateApplicationlicationSupportsIndirectInputEvents = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1033,7 +1028,6 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 637867499T; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.templateapplication.tests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1053,7 +1047,6 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 637867499T; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.templateapplication.tests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1072,7 +1065,6 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 637867499T; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.templateapplicationuitests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1091,7 +1083,6 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 637867499T; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.spezi.templateapplicationuitests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1241,7 +1232,7 @@ repositoryURL = "https://github.com/StanfordBDHG/XCTestExtensions.git"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 0.4.7; + minimumVersion = 0.4.8; }; }; 2FE5DC9A29EDD9EF004B9AB4 /* XCRemoteSwiftPackageReference "XCTHealthKit" */ = { diff --git a/TemplateApplication.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TemplateApplication.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index c6a59ae..c94b480 100644 --- a/TemplateApplication.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/TemplateApplication.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/app-check.git", "state" : { - "revision" : "5746b2d35c91c50581590ed97abe4c06b5037274", - "version" : "10.18.0" + "revision" : "3e464dad87dad2d29bb29a97836789bf0f8f67d2", + "version" : "10.18.1" } }, { @@ -32,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/firebase-ios-sdk.git", "state" : { - "revision" : "c60c958e707c50a9cf8bcb7cfd7d51c566d726c5", - "version" : "10.19.1" + "revision" : "b880ec8ec927a838c51c12862c6222c30d7097d7", + "version" : "10.20.0" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleAppMeasurement.git", "state" : { - "revision" : "6b332152355c372ace9966d8ee76ed191f97025e", - "version" : "10.17.0" + "revision" : "ceec9f28dea12b7cf3dabf18b5ed7621c88fd4aa", + "version" : "10.20.0" } }, { @@ -185,8 +185,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/StanfordSpezi/SpeziFoundation.git", "state" : { - "revision" : "683c66f922a4cfe0882c4a86a43854f613b48541", - "version" : "1.0.0" + "revision" : "d1e6d4cddcf236038d21a73d671806d8ba51b01c", + "version" : "1.0.1" } }, { @@ -212,8 +212,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/StanfordSpezi/SpeziOnboarding", "state" : { - "revision" : "ae7b18a18453557cd95c7adeb8f75846f48c343c", - "version" : "1.0.0" + "revision" : "3ee713576eaeaa03200ba26bbc1269ceeb6abb25", + "version" : "1.0.1" } }, { @@ -293,8 +293,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/StanfordBDHG/XCTestExtensions.git", "state" : { - "revision" : "388a6d6a5be48eff5d98a2c45e0b50f30ed21dc3", - "version" : "0.4.7" + "revision" : "fb7fcee97c574b950e03b0a53874e26db27db2fe", + "version" : "0.4.8" } }, { diff --git a/TemplateApplicationUITests/ContributionsTest.swift b/TemplateApplicationUITests/ContributionsTest.swift index 99227a7..768d6ba 100644 --- a/TemplateApplicationUITests/ContributionsTest.swift +++ b/TemplateApplicationUITests/ContributionsTest.swift @@ -13,8 +13,6 @@ final class ContributionsTest: XCTestCase { override func setUpWithError() throws { try super.setUpWithError() - try disablePasswordAutofill() - continueAfterFailure = false let app = XCUIApplication() diff --git a/TemplateApplicationUITests/OnboardingTests.swift b/TemplateApplicationUITests/OnboardingTests.swift index c3c2873..e91f5ed 100644 --- a/TemplateApplicationUITests/OnboardingTests.swift +++ b/TemplateApplicationUITests/OnboardingTests.swift @@ -14,8 +14,6 @@ import XCTHealthKit class OnboardingTests: XCTestCase { override func setUpWithError() throws { try super.setUpWithError() - - try disablePasswordAutofill() continueAfterFailure = false diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ce180ba..f3e14ad 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -21,9 +21,7 @@ platform :ios do derived_data_path: ".derivedData", code_coverage: true, devices: ["iPhone 15 Pro"], - force_quit_simulator: true, - reset_simulator: true, - prelaunch_simulator: false, + disable_slide_to_type: false, concurrent_workers: 1, max_concurrent_simulators: 1, result_bundle: true,