Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/SwifterSwift/SwifterSwift:
  Fix swiftlint warnings (SwifterSwift#1060)
  Update README_CN.md 馃殌 (SwifterSwift#1031)
  Update README.md 馃殌 (SwifterSwift#1030)
  Rename Color, EdgeInset and Font typealiases to fix namespace conflicts with SwiftUI Types 馃殌 (SwifterSwift#1055)
  [CI] Fixing CI issues (SwifterSwift#1056)
  fix nearestTenMinutes behavior (SwifterSwift#1034)
  Added missing changelog for PR SwifterSwift#1045 (SwifterSwift#1046)
  • Loading branch information
Andy0570 committed Nov 18, 2022
2 parents 430cfd5 + 39df537 commit 56ab423
Show file tree
Hide file tree
Showing 42 changed files with 918 additions and 866 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: macos-latest
env:
PROJECT: SwifterSwift.xcodeproj
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
steps:
- uses: actions/checkout@v1
- name: Bundle Install
Expand Down Expand Up @@ -43,12 +43,12 @@ jobs:
bash <(curl -s https://codecov.io/bash) -cF tvos -J 'SwifterSwift'
env:
SCHEME: SwifterSwift-tvOS
DESTINATION: platform=tvOS Simulator,name=Apple TV 4K (at 1080p)
DESTINATION: platform=tvOS Simulator,name=Apple TV
- name: Build WatchOS
run: xcodebuild clean build -project $PROJECT -scheme $SCHEME -destination "$DESTINATION"
env:
SCHEME: SwifterSwift-watchOS
DESTINATION: name=Apple Watch Series 5 - 40mm
DESTINATION: platform=watchOS Simulator,name=Apple Watch Series 5 - 40mm

- name: Danger Swift
# Hack to by pass the key invalidation mechanism
Expand All @@ -74,7 +74,7 @@ jobs:
matrix:
platform: ['ios', 'macos', 'tvos', 'watchos']
env:
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
steps:
- uses: actions/checkout@v1
- name: Bundle Install
Expand Down
1 change: 1 addition & 0 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
brew "swiftformat"
brew "ruby"
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,24 @@
The changelog for **SwifterSwift**. Also see the [releases](https://github.com/SwifterSwift/SwifterSwift/releases) on GitHub.

## Upcoming Release
### Breaking Change
- **Color**
- Renamed typealias `Color` typealias to `SFColor` to fix namespace conflicts with swiftUI's `Color` Type. [#1055](https://github.com/SwifterSwift/SwifterSwift/pull/1055) by [MussaCharles](https://github.com/MussaCharles)
- **EdgeInsets**
- Renamed `EdgeInsets` typealias to `SFEdgeInsets` to fix namespace conflicts with swiftUI's `EdgeInsets` Type. [#1055](https://github.com/SwifterSwift/SwifterSwift/pull/1055) by [MussaCharles](https://github.com/MussaCharles)
- **Font**
- Renamed `Font` typealias to `SFFont` to fix namespace conflicts with swiftUI's `Font` Type. [#1055](https://github.com/SwifterSwift/SwifterSwift/pull/1055) by [MussaCharles](https://github.com/MussaCharles)

### Added
- **UIButton**
- Added `setBackgroundColor(_:for:)` method for setting background color for the specified UI state. [#1041](https://github.com/SwifterSwift/SwifterSwift/pull/1041) by [TwizzyIndy](https://github.com/TwizzyIndy)

### Fixed
- **Date**
- Fixed incorrect calculation in `nearestTenMinutes` to align with other `nearest*` date calculations. [#1034](https://github.com/SwifterSwift/SwifterSwift/pull/1034) by [mmdock](https://github.com/mmdock)
- **Digest**
- `DigestExtensions.swift` would not compile on Xcode 14 due to an `ambiguous use of 'makeIterator()'` error. [#1042](https://github.com/SwifterSwift/SwifterSwift/issues/1042) by [theedov](https://github.com/theedov)

## [v5.3.0](https://github.com/SwifterSwift/SwifterSwift/releases/tag/5.3.0)
### Breaking Change
- **Sequence**
Expand Down
3 changes: 2 additions & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ warn('This pull request is marked as Work in Progress. DO NOT MERGE!') if github

# Xcode summary
def summary(platform:)
xcode_summary.report "xcodebuild-#{platform}.json"
# TODO: This is failing in CI step, commenting(since is only summary info) to unblock builds but we need to investigate.
# xcode_summary.report "xcodebuild-#{platform}.json"
end

def label_tests_summary(label:, platform:)
Expand Down

0 comments on commit 56ab423

Please sign in to comment.