[6.1][Android] Get this repo building again #5151
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The windows host builds with the old driver for now, so it doesn't yet support wmo
|
@swift-ci, please test |
compnerd
approved these changes
Dec 17, 2024
|
@swift-ci please test |
parkera
reviewed
Dec 17, 2024
| @@ -164,7 +164,7 @@ class TestTimeZone: XCTestCase { | |||
| var lt = tm() | |||
| localtime_r(&t, <) | |||
| let zoneName = NSTimeZone.system.abbreviation() ?? "Invalid Abbreviation" | |||
| let expectedName = String(cString: lt.tm_zone, encoding: .ascii) ?? "Invalid Zone" | |||
| let expectedName = String(cString: lt.tm_zone!, encoding: .ascii) ?? "Invalid Zone" | |||
There was a problem hiding this comment.
Does this force unwrap produce a warning for non-Android platforms now?
|
Thank you! |
|
@finagolfin can you verify everything here is also on main? |
|
This 6.1 pull consists of cherry-picking all the commits from the three merged trunk pulls linked above. I downloaded this 6.1 patch now and compared it to those trunk patches, appears the same. @parkera, can we get this into the 6.0 branch next, after winter break? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation: These pulls get this repo building again with the new Android overlay, swiftlang/swift#72161.
Scope: Mostly just adds imports and other Android-specific dependencies, along with some force unwraps because Bionic added nullability annotations.
Issue: None
Original PRs: #5024, #5144, #5149
Risk: low
Testing: Passed all CI on trunk and I've been running it through my Android CI for months now
Reviewer: @compnerd @jmschonfeld
@hyp, all this is missing is your fix for the nullability annotation in
Process.swiftthat you plan to submit, and this repo works on Android again.