Skip to content

Conversation

@johnno1962
Copy link
Contributor

@johnno1962 johnno1962 commented Jul 12, 2018

As discussed in #1626, cherry picks of #1518, #1528.

@parkera
Copy link
Contributor

parkera commented Jul 12, 2018

@swift-ci please test

@johnno1962
Copy link
Contributor Author

Ready to merge when you are..

@parkera parkera merged commit fb20a32 into swiftlang:swift-4.2-branch Jul 16, 2018
@johnno1962
Copy link
Contributor Author

Thanks @parkera. That’s all from me for now.

xwu pushed a commit to xwu/swift-corelibs-foundation that referenced this pull request Jul 16, 2018
* Changes required for swift-4.1-branch port to Android

* Remove contentious wokrarounds

* Centralise test imports and add os(Android)

* Leave imports in xdgTestHelper.swift
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.

2 participants