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

chore(ios): Bump to Xcode 15.1 and Ruby 3.2.2 [UI-5184] #477

Merged
merged 17 commits into from
Jan 30, 2024

Conversation

robmaceachern
Copy link
Member

@robmaceachern robmaceachern commented Jan 22, 2024

For UI-5184

  • Updated CI to use M1 machines, Xcode 15.1, and Ruby 3.2.2.

  • Added iOS 17 snapshot images.

  • Removed iOS 14 snapshot images (deployment target change coming in followup PR)

  • Bump Swift version to 5.9.

  • Update Ruby gems.

  • iOS 14.5 SDK removed from test matrix.

  • iOS 15.0 SDK updated to iOS 15.4 in test matrix.

  • iOS 17.2 SDK added to test matrix.

  • Update repo required checks: include iOS 17 tests, remove iOS 14, and update to iOS 15.4.

@robmaceachern robmaceachern force-pushed the robmaceachern/xcode-15-bump branch 2 times, most recently from a00a5c7 to 2b21739 Compare January 24, 2024 17:16
Comment on lines +3 to +5
# Read the current Ruby version from the .ruby-version file
ruby Bundler.read_file(Bundler.root.join('.ruby-version')).strip

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not strictly necessary but should help ensure that we aren't accidentally using the wrong Ruby version when bumping gems (a mistake I made when bumping the gems in this PR!)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, interesting, did you find this somewhere?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this was a bit of a rabbit hole. It went something like:

@robmaceachern robmaceachern changed the title Bump to Xcode 15.1 and Ruby 3.2 chore(ios): Bump to Xcode 15.1 and Ruby 3.2.2 [UI-5184] Jan 26, 2024
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calling out this and the following image for superficial iOS 15 changes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calling out this and the following image for superficial iOS 15 changes.

@@ -119,9 +119,6 @@ class AttributedTextTests: XCTestCase {
var text = AttributedText("some emoji: 😵‍💫👨‍👩‍👧‍👦🏃🏽 and some hiragana: あいうえお and some katakana: アイウエオカキクケコ")
text.color = .blue

let partialEmoji = text.range(of: "😵")!
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was failing on iOS 17 tests and tbh I don't know if it really makes sense so I've removed it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to say that we copied these from some tests in the swift repo but I can't find the originals.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know there's one other kind of unusual emoji range test I've run into here: https://github.com/squareup/market/pull/7112/files#r1341394435

@robmaceachern robmaceachern marked this pull request as ready for review January 26, 2024 15:48
@robmaceachern robmaceachern requested a review from a team as a code owner January 26, 2024 15:48
@watt watt self-assigned this Jan 30, 2024
Comment on lines +3 to +5
# Read the current Ruby version from the .ruby-version file
ruby Bundler.read_file(Bundler.root.join('.ruby-version')).strip

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, interesting, did you find this somewhere?

@@ -119,9 +119,6 @@ class AttributedTextTests: XCTestCase {
var text = AttributedText("some emoji: 😵‍💫👨‍👩‍👧‍👦🏃🏽 and some hiragana: あいうえお and some katakana: アイウエオカキクケコ")
text.color = .blue

let partialEmoji = text.range(of: "😵")!
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to say that we copied these from some tests in the swift repo but I can't find the originals.

@robmaceachern robmaceachern merged commit 0fbe962 into main Jan 30, 2024
5 checks passed
@robmaceachern robmaceachern deleted the robmaceachern/xcode-15-bump branch January 30, 2024 23:50
kyleve added a commit that referenced this pull request Mar 16, 2024
…ller

* origin/main: (62 commits)
  AccessibilityBlocker aggressively blocking. (#483)
  Bumping version to 3.0.0 (#482)
  Allow for customization of the preview name (#478)
  Update CHANGELOG for AttributedLabel fixes (#480)
  Fix link detection for stretched labels (#476)
  chore: Updated minimum deployment target from iOS 14 to iOS 15 [UI-5185] (#479)
  chore(ios): Bump to Xcode 15.1 and Ruby 3.2.2 [UI-5184] (#477)
  AXCustomContent Support (#471)
  Bumping versions to 2.2.0 (#470)
  Update concatenation logic and unit tests
  update changelog
  never cache subelements
  optionally do not cache subelements
  Feature: add TintAdjustmentMode, modifiers, and tests
  Add to CHANGELOG
  Add tintAdjustmentMode to Image
  Bumping versions to 2.1.0 (#466)
  Resolved a Swift 5.9 compilation warning (#465)
  Update KeyboardObserver (#463)
  Bump activesupport from 7.0.4.3 to 7.0.7.2
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants