Skip to content
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
15 changes: 15 additions & 0 deletions .github/workflows/swiftpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,18 @@ jobs:
run: swift build -v
- name: Test
run: swift test -v
Android:
name: Android with Swift ${{ matrix.tag }}
strategy:
matrix:
tag: ['6.0.3']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: skiptools/swift-android-action@v2
with:
swift-version: ${{ matrix.tag }}
# needed for tests that use fixturesDirectory
copy-files: Tests
test-env: TEST_WORKSPACE=1

9 changes: 4 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@

##### Enhancements

* Yams is able to encode and decode Anchors via YamlAnchorProviding, and
YamlAnchorCoding.
[Adora Lynch](https://github.com/lynchsft)
[#125](https://github.com/jpsim/Yams/issues/125)

* Add Android Support
[Marc Prud'hommeaux](https://github.com/marcprux)
[#437](https://github.com/jpsim/Yams/pull/437)

Comment thread
marcprux marked this conversation as resolved.
* Yams is able to encode and decode Tags via YamlTagProviding
and YamlTagCoding.
[Adora Lynch](https://github.com/lynchsft)
Expand Down
12 changes: 10 additions & 2 deletions Tests/YamsTests/PerformanceTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,16 @@ class PerformanceTests: XCTestCase {
XCTFail("\(error)")
}
}

#if canImport(Combine)
#if canImport(Android)
func measure(_ block: () -> Void) {
let start = Date.now
// the hardwired max standard deviation of 10% varies too much on the Android emulator and fails the tests
// this is being tracked at https://github.com/swiftlang/swift-corelibs-xctest/pull/506
block()
let duration = Date.now.timeIntervalSince(start)
print("measured time: \(duration)")
}
#elseif canImport(Combine)
override func measure(_ block: () -> Void) {
if #available(macOS 10.15, iOS 13, tvOS 13, *) {
let metrics: [XCTMetric] = [XCTClockMetric(), XCTCPUMetric(), XCTMemoryMetric(), XCTStorageMetric()]
Expand Down