From 507ba0558b24532ddf22050ffbc8f68a85a8bae8 Mon Sep 17 00:00:00 2001 From: Paul Schmiedmayer Date: Tue, 2 Apr 2024 00:43:46 -0700 Subject: [PATCH] Update Setup --- .github/workflows/beta-deployment.yml | 4 ++-- .github/workflows/build-and-test.yml | 4 ++-- .gitignore | 2 +- ENGAGEHF.xcodeproj/project.pbxproj | 25 +++++-------------------- ENGAGEHF.xctestplan | 4 ++-- codecov.yml | 4 ++-- 6 files changed, 14 insertions(+), 29 deletions(-) diff --git a/.github/workflows/beta-deployment.yml b/.github/workflows/beta-deployment.yml index 7deedb14..8db3deb2 100644 --- a/.github/workflows/beta-deployment.yml +++ b/.github/workflows/beta-deployment.yml @@ -24,11 +24,11 @@ jobs: iosapptestflightdeployment: name: iOS App TestFlight Deployment needs: buildandtest - uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 + uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2 permissions: contents: read with: - googleserviceinfoplistpath: 'ENGAGE-HF/Supporting Files/GoogleService-Info.plist' + googleserviceinfoplistpath: 'ENGAGEHF/Supporting Files/GoogleService-Info.plist' setupsigning: true fastlanelane: beta secrets: inherit diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a91d26e7..1baf547b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -35,7 +35,7 @@ jobs: permissions: contents: read with: - artifactname: ENGAGE-HF.xcresult + artifactname: ENGAGEHF.xcresult runsonlabels: '["macOS", "self-hosted"]' setupSimulators: true setupfirebaseemulator: true @@ -47,6 +47,6 @@ jobs: permissions: contents: read with: - coveragereports: ENGAGE-HF.xcresult + coveragereports: ENGAGEHF.xcresult secrets: token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.gitignore b/.gitignore index 8a11fe77..00977e79 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ xcuserdata/ # Tests report.junit report.html -ENGAGE-HF.xcresult +ENGAGEHF.xcresult # Logs logs diff --git a/ENGAGEHF.xcodeproj/project.pbxproj b/ENGAGEHF.xcodeproj/project.pbxproj index f9e8d0e0..60fddf9a 100644 --- a/ENGAGEHF.xcodeproj/project.pbxproj +++ b/ENGAGEHF.xcodeproj/project.pbxproj @@ -79,14 +79,14 @@ containerPortal = 653A2545283387FE005D4D48 /* Project object */; proxyType = 1; remoteGlobalIDString = 653A254C283387FE005D4D48; - remoteInfo = "ENGAGE-HF"; + remoteInfo = "ENGAGEHF"; }; 653A256828338800005D4D48 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 653A2545283387FE005D4D48 /* Project object */; proxyType = 1; remoteGlobalIDString = 653A254C283387FE005D4D48; - remoteInfo = "ENGAGE-HF"; + remoteInfo = "ENGAGEHF"; }; /* End PBXContainerItemProxy section */ @@ -394,7 +394,7 @@ 56E708342BB06B7100B08F0A /* SpeziLicense */, 56E7083A2BB06F6F00B08F0A /* SwiftPackageList */, ); - productName = "ENGAGE-HF"; + productName = "ENGAGEHF"; productReference = 653A254D283387FE005D4D48 /* ENGAGEHF.app */; productType = "com.apple.product-type.application"; }; @@ -412,7 +412,7 @@ 653A255F28338800005D4D48 /* PBXTargetDependency */, ); name = ENGAGEHFTests; - productName = "ENGAGE-HFTests"; + productName = "ENGAGEHFTests"; productReference = 653A255D28338800005D4D48 /* ENGAGEHFTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; @@ -434,7 +434,7 @@ 2FE5DC9829EDD9D9004B9AB4 /* XCTestExtensions */, 2FE5DC9B29EDD9EF004B9AB4 /* XCTHealthKit */, ); - productName = "ENGAGE-HFUITests"; + productName = "ENGAGEHFUITests"; productReference = 653A256728338800005D4D48 /* ENGAGEHFUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; @@ -695,8 +695,6 @@ INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; INFOPLIST_KEY_NSMotionUsageDescription = "This message should never appear. Please adjust this when you start using motion information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = "This message should never appear. Please adjust this when you start using speecg information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; - "INFOPLIST_KEY_UIENGAGE-HFlicationSceneManifest_Generation" = YES; - "INFOPLIST_KEY_UIENGAGE-HFlicationSupportsIndirectInputEvents" = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; @@ -711,7 +709,6 @@ SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = YES; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -729,7 +726,6 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehf.tests; PRODUCT_NAME = "$(TARGET_NAME)"; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = NO; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ENGAGEHF.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ENGAGEHF"; }; @@ -747,7 +743,6 @@ PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehfuitests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = NO; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = ENGAGEHF; }; @@ -897,8 +892,6 @@ INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; INFOPLIST_KEY_NSMotionUsageDescription = "This message should never appear. Please adjust this when you start using motion information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = "This message should never appear. Please adjust this when you start using speecg information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; - "INFOPLIST_KEY_UIENGAGE-HFlicationSceneManifest_Generation" = YES; - "INFOPLIST_KEY_UIENGAGE-HFlicationSupportsIndirectInputEvents" = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; @@ -913,7 +906,6 @@ SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = YES; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -943,8 +935,6 @@ INFOPLIST_KEY_NSMicrophoneUsageDescription = "This message should never appear. Please adjust this when you start using microphone information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; INFOPLIST_KEY_NSMotionUsageDescription = "This message should never appear. Please adjust this when you start using motion information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; INFOPLIST_KEY_NSSpeechRecognitionUsageDescription = "This message should never appear. Please adjust this when you start using speecg information. We have to put this in here as ResearchKit has the possibility to use it and not putting it here returns an error on AppStore Connect."; - "INFOPLIST_KEY_UIENGAGE-HFlicationSceneManifest_Generation" = YES; - "INFOPLIST_KEY_UIENGAGE-HFlicationSupportsIndirectInputEvents" = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; @@ -960,7 +950,6 @@ SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = YES; SWIFT_EMIT_LOC_STRINGS = YES; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -978,7 +967,6 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehf.tests; PRODUCT_NAME = "$(TARGET_NAME)"; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = NO; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ENGAGEHF.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ENGAGEHF"; }; @@ -996,7 +984,6 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehf.tests; PRODUCT_NAME = "$(TARGET_NAME)"; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = NO; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ENGAGEHF.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ENGAGEHF"; }; @@ -1014,7 +1001,6 @@ PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehfuitests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = NO; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = ENGAGEHF; }; @@ -1032,7 +1018,6 @@ PRODUCT_BUNDLE_IDENTIFIER = edu.stanford.bdh.engagehfuitests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - "SWIFT_ELicenseRef-ENGAGE-HF_LOC_STRINGS" = NO; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = ENGAGEHF; }; diff --git a/ENGAGEHF.xctestplan b/ENGAGEHF.xctestplan index 32981c29..30d2620e 100644 --- a/ENGAGEHF.xctestplan +++ b/ENGAGEHF.xctestplan @@ -19,9 +19,9 @@ ] }, "targetForVariableExpansion" : { - "containerPath" : "container:ENGAGE-HF.xcodeproj", + "containerPath" : "container:ENGAGEHF.xcodeproj", "identifier" : "653A254C283387FE005D4D48", - "name" : "ENGAGE-HF" + "name" : "ENGAGEHF" } }, "testTargets" : [ diff --git a/codecov.yml b/codecov.yml index 0a0b7f2a..7bb2d0ad 100644 --- a/codecov.yml +++ b/codecov.yml @@ -29,8 +29,8 @@ coverage: target: auto threshold: 5.0 ignore: -- ^ENGAGE-HFUITests.* -- ^ENGAGE-HFTests.* +- ^ENGAGEHFUITests.* +- ^ENGAGEHFTests.* parsers: gcov: branch_detection: