From e42977a7b093a211fc6c9614a50c118a7c41e148 Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 13 Oct 2023 15:10:27 +0100 Subject: [PATCH] Remove smudging workarounds. --- ElementX.xcodeproj/project.pbxproj | 2 -- fastlane/Fastfile | 9 --------- project.yml | 1 - 3 files changed, 12 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 30a8546f5..4cc4943e3 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -5656,7 +5656,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GIT_LFS_SKIP_SMUDGE = on; IPHONEOS_DEPLOYMENT_TARGET = 16.4; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 13.3; @@ -5732,7 +5731,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - GIT_LFS_SKIP_SMUDGE = on; IPHONEOS_DEPLOYMENT_TARGET = 16.4; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 13.3; diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d8d1a581f..d05025811 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -76,9 +76,6 @@ lane :alpha do end lane :unit_tests do - # Xcode fails to check out Compound snapshots. We don't need them so skip smudging. - ENV["GIT_LFS_SKIP_SMUDGE"] = "true" - run_tests( scheme: "UnitTests", device: 'iPhone 14 (16.4)', @@ -96,9 +93,6 @@ lane :unit_tests do end lane :ui_tests do |options| - # Xcode fails to check out Compound snapshots. We don't need them so skip smudging. - ENV["GIT_LFS_SKIP_SMUDGE"] = "true" - # Use a fresh simulator state to ensure hardware keyboard isn't attached. reset_simulator_contents() @@ -142,9 +136,6 @@ end lane :integration_tests do - # Xcode fails to check out Compound snapshots. We don't need them so skip smudging. - ENV["GIT_LFS_SKIP_SMUDGE"] = "true" - clear_derived_data() create_simulator_if_necessary( diff --git a/project.yml b/project.yml index d7db09826..6dd1ab823 100644 --- a/project.yml +++ b/project.yml @@ -20,7 +20,6 @@ options: postGenCommand: cd Tools/XcodeGen && sh postGenCommand.sh settings: - GIT_LFS_SKIP_SMUDGE: "on" CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: YES ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME: "colors/accent-color" ENABLE_BITCODE: NO