Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(tools): use xcode 15 #9323

Merged
merged 16 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:
BUNDLE_PATH: .vendor

macos:
xcode: 14.3.1
xcode: 15.1
resource_class: macos.m1.medium.gen1

steps:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.1.4
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodejs 20.9.0
ruby 2.7.8
ruby 3.1.4
java zulu-11.58.15
4 changes: 2 additions & 2 deletions docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<details><summary>NOTE: After installing Xcode</summary>

Check that Command Line Tools version is added in the Locations tab. Xcode>Settings>Locations:
<img width="375" alt="" src="https://user-images.githubusercontent.com/29984068/123970729-6009cf00-d987-11eb-933a-1603ba4d6ae8.png">
![command-line-tools](./screenshots/command-line-tools.png)

</details>

Expand Down
Binary file added docs/screenshots/command-line-tools.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...enceImages/ARTextViewSpec/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...onInformationViewControllerTests/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions ios/ArtsyTests/Supporting_Files/ARTestHelper.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
CodePush: dce1b253fde81078249ea9cd4b948e4ac7b761a9
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
"Expecta+Snapshots": dcff217eef506dabd6dfdc7864ea2da321fafbb8
FBAEMKit: d8312d8451ead46282adc7f3565ffc4965e3a4a7
Expand Down Expand Up @@ -1208,7 +1208,7 @@ SPEC CHECKSUMS:
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
Forgeries: 64ced144ea8341d89a7eec9d1d7986f0f1366250
FXBlurView: db786c2561cb49a09ae98407f52460096ab8a44f
glog: 5337263514dd6f09803962437687240c5dc39aa4
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/ci-setup-export-vars
Original file line number Diff line number Diff line change
Expand Up @@ -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"