diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ec210f8506..ad3d1ec72bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -228,7 +228,7 @@ jobs: BUNDLE_PATH: vendor/bundle # path to install gems and use for caching macos: - xcode: 13.0.0 + xcode: 13.2.1 steps: - checkout @@ -270,7 +270,7 @@ jobs: BUNDLE_PATH: vendor/bundle # path to install gems and use for caching macos: - xcode: 13.0.0 + xcode: 13.2.1 steps: - checkout @@ -348,7 +348,7 @@ jobs: BUNDLE_PATH: vendor/bundle # path to install gems and use for caching macos: - xcode: 13.0.0 + xcode: 13.2.1 steps: - attach_workspace: @@ -448,7 +448,7 @@ jobs: environment: BUNDLE_PATH: vendor/bundle # path to install gems and use for caching macos: - xcode: 13.0.0 + xcode: 13.2.1 steps: - checkout - install-gems diff --git a/.yarnrc b/.yarnrc index 60071eeb38c..58c3c6e68ed 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1 +1,2 @@ -unsafe-disable-integrity-migration true \ No newline at end of file +unsafe-disable-integrity-migration true +save-prefix "" diff --git a/Artsy_Tests/Supporting_Files/ARTestHelper.m b/Artsy_Tests/Supporting_Files/ARTestHelper.m index d531542fbe5..e6d9c233abc 100644 --- a/Artsy_Tests/Supporting_Files/ARTestHelper.m +++ b/Artsy_Tests/Supporting_Files/ARTestHelper.m @@ -16,8 +16,8 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions: { NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion; - NSAssert(version.majorVersion == 15 && version.minorVersion == 0, - @"The tests should be run on iOS 15.0, not %ld.%ld", version.majorVersion, version.minorVersion); + NSAssert(version.majorVersion == 15 && version.minorVersion == 2, + @"The tests should be run on iOS 15.2, not %ld.%ld", version.majorVersion, version.minorVersion); CGSize nativeResolution = [UIScreen mainScreen].nativeBounds.size; NSAssert([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone && CGSizeEqualToSize(nativeResolution, CGSizeMake(1170, 2532)), diff --git a/scripts/source-for-bash-env b/scripts/source-for-bash-env index c1819240427..221393d54b0 100755 --- a/scripts/source-for-bash-env +++ b/scripts/source-for-bash-env @@ -9,7 +9,7 @@ export LOCAL_BRANCH export WORKSPACE="Artsy.xcworkspace" export SCHEME="Artsy" export DEVICE_HOST_PLAT="iOS Simulator" -export DEVICE_HOST_OS="15.0" +export DEVICE_HOST_OS="15.2" export DEVICE_HOST_NAME="iPhone 13 Pro" export DERIVED_DATA_PATH="derived_data" export CONFIGURATION="Beta"