diff --git a/.circleci/config.yml b/.circleci/config.yml index 2624ee83803..a34b59718f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,7 +185,7 @@ jobs: BUNDLE_PATH: .vendor macos: - xcode: 14.3.1 + xcode: 15.1 resource_class: macos.m1.medium.gen1 steps: @@ -280,7 +280,7 @@ jobs: BUNDLE_PATH: .vendor # path to install gems and use for caching macos: - xcode: 14.3.1 + xcode: 15.1 resource_class: macos.m1.medium.gen1 steps: @@ -330,7 +330,7 @@ jobs: BUNDLE_PATH: .vendor # path to install gems and use for caching macos: - xcode: 14.3.1 + xcode: 15.1 resource_class: macos.m1.medium.gen1 steps: @@ -370,11 +370,12 @@ jobs: - update-echo - install-gems - install-cocoapods + - macos/preboot-simulator: + version: "17.2" + platform: "iOS" + device: "iPhone 15 Pro" - build-app-ios - macos/install-rosetta - - macos/preboot-simulator: - device: "iPhone 14 Pro" - version: "16.4" - run: name: Run tests if native code has changed command: ls xcode_test_raw.log || ./scripts/ci/ci-test-ios diff --git a/.ruby-version b/.ruby-version index 6a81b4c8379..0aec50e6ede 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.1.4 diff --git a/.tool-versions b/.tool-versions index af88c164dd0..0c6ff2f92e9 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ nodejs 20.9.0 -ruby 2.7.8 +ruby 3.1.4 java zulu-11.58.15 diff --git a/docs/getting_started.md b/docs/getting_started.md index 0a795ebbeab..14be5c67ebc 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -19,14 +19,14 @@ asdf plugin add java ### Set up iOS -Download Xcode version 14. You can find all available versions of Xcode at [Apple's Developer Portal 🔐](http://developer.apple.com/download/more/). +Download Xcode version 15. You can find all available versions of Xcode at [Apple's Developer Portal 🔐](http://developer.apple.com/download/more/). Ask your mentor to add you on the [firebase.console](https://console.firebase.google.com/project/eigen-a7d3b/settings/iam) to be able to release.
NOTE: After installing Xcode Check that Command Line Tools version is added in the Locations tab. Xcode>Settings>Locations: - +![command-line-tools](./screenshots/command-line-tools.png)
diff --git a/docs/screenshots/command-line-tools.png b/docs/screenshots/command-line-tools.png new file mode 100644 index 00000000000..0797056f483 Binary files /dev/null and b/docs/screenshots/command-line-tools.png differ diff --git a/ios/ArtsyTests/ReferenceImages/ARTextViewSpec/with_HTML_looks_right_with_multiple_paragraphs@3x.png b/ios/ArtsyTests/ReferenceImages/ARTextViewSpec/with_HTML_looks_right_with_multiple_paragraphs@3x.png index 4ffbd059cc1..cb591c5a3af 100644 Binary files a/ios/ArtsyTests/ReferenceImages/ARTextViewSpec/with_HTML_looks_right_with_multiple_paragraphs@3x.png and b/ios/ArtsyTests/ReferenceImages/ARTextViewSpec/with_HTML_looks_right_with_multiple_paragraphs@3x.png differ diff --git a/ios/ArtsyTests/ReferenceImages/AuctionInformationViewControllerTests/a_closed_sale__shows_the_sale_is_closed@3x.png b/ios/ArtsyTests/ReferenceImages/AuctionInformationViewControllerTests/a_closed_sale__shows_the_sale_is_closed@3x.png index 06efac95843..bb02529997c 100644 Binary files a/ios/ArtsyTests/ReferenceImages/AuctionInformationViewControllerTests/a_closed_sale__shows_the_sale_is_closed@3x.png and b/ios/ArtsyTests/ReferenceImages/AuctionInformationViewControllerTests/a_closed_sale__shows_the_sale_is_closed@3x.png differ diff --git a/ios/ArtsyTests/Supporting_Files/ARTestHelper.m b/ios/ArtsyTests/Supporting_Files/ARTestHelper.m index 5d115169b01..a9b5cc516d2 100644 --- a/ios/ArtsyTests/Supporting_Files/ARTestHelper.m +++ b/ios/ArtsyTests/Supporting_Files/ARTestHelper.m @@ -16,12 +16,12 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions: { NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion; - NSAssert(version.majorVersion == 16 && version.minorVersion == 4, - @"The tests should be run on iOS 16.4, not %ld.%ld", version.majorVersion, version.minorVersion); + NSAssert(version.majorVersion == 17 && version.minorVersion == 2, + @"The tests should be run on iOS 17.2, not %ld.%ld", version.majorVersion, version.minorVersion); CGSize nativeResolution = [UIScreen mainScreen].nativeBounds.size; NSAssert([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone && CGSizeEqualToSize(nativeResolution, CGSizeMake(1179, 2556)), - @"The tests should be run on an iPhone 14 Pro, not a device with native resolution %@", + @"The tests should be run on an iPhone 15 Pro, not a device with native resolution %@", NSStringFromCGSize(nativeResolution)); ARPerformWorkAsynchronously = NO; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 37ddbb8ed43..9d071658aaa 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1179,7 +1179,7 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da CodePush: dce1b253fde81078249ea9cd4b948e4ac7b761a9 - DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 + DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 "Expecta+Snapshots": dcff217eef506dabd6dfdc7864ea2da321fafbb8 FBAEMKit: d8312d8451ead46282adc7f3565ffc4965e3a4a7 @@ -1208,7 +1208,7 @@ SPEC CHECKSUMS: fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 Forgeries: 64ced144ea8341d89a7eec9d1d7986f0f1366250 FXBlurView: db786c2561cb49a09ae98407f52460096ab8a44f - glog: 5337263514dd6f09803962437687240c5dc39aa4 + glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213 GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 diff --git a/scripts/ci/ci-setup-export-vars b/scripts/ci/ci-setup-export-vars index 1d291c77905..bc646e600e8 100755 --- a/scripts/ci/ci-setup-export-vars +++ b/scripts/ci/ci-setup-export-vars @@ -10,7 +10,7 @@ export LOCAL_BRANCH export WORKSPACE="ios/Artsy.xcworkspace" export SCHEME="Artsy" export DEVICE_HOST_PLAT="iOS Simulator" -export DEVICE_HOST_OS="16.4" -export DEVICE_HOST_NAME="iPhone 14 Pro" +export DEVICE_HOST_OS="17.2" +export DEVICE_HOST_NAME="iPhone 15 Pro" export DERIVED_DATA_PATH="derived_data" export CONFIGURATION="Release"