Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Andy0570/SwifterSwift int…
Browse files Browse the repository at this point in the history
…o develop

* 'master' of https://github.com/Andy0570/SwifterSwift:
  Removing Xctool from project (SwifterSwift#1035)
  Bump tzinfo from 1.2.9 to 1.2.10 (SwifterSwift#1028)
  hexString computed property for CryptoKit.Digest (SwifterSwift#1026)
  Update CONTRIBUTING.md (SwifterSwift#1024)
  Project fixes (SwifterSwift#1017)
  Fixes UIView.rotate(toAngle) (SwifterSwift#1019)
  deletingAllPathComponents can now handle empty paths (SwifterSwift#1018)
  Bump jmespath from 1.4.0 to 1.6.1 (SwifterSwift#1015)

# Conflicts:
#	Sources/SwifterSwift/UIKit/UIViewExtensions.swift
#	Tests/UIKitTests/UIViewExtensionsTests.swift
  • Loading branch information
Andy0570 committed Aug 24, 2022
2 parents 001de47 + a286211 commit 6f196d9
Show file tree
Hide file tree
Showing 39 changed files with 516 additions and 240 deletions.
1 change: 0 additions & 1 deletion Brewfile
@@ -1,2 +1 @@
brew "swiftformat"
brew "xctool"
50 changes: 38 additions & 12 deletions Brewfile.lock.json
Expand Up @@ -2,22 +2,40 @@
"entries": {
"brew": {
"swiftformat": {
"version": "0.47.0",
"version": "0.49.14",
"bottle": {
"cellar": ":any_skip_relocation",
"prefix": "/usr/local",
"rebuild": 0,
"root_url": "https://ghcr.io/v2/homebrew/core",
"files": {
"catalina": {
"url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.0.catalina.bottle.tar.gz",
"sha256": "81431257faa84ed092b02dbcaa5703e2759d915cb18c3a7c8f663311cbd2d79e"
"arm64_monterey": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:7f8d9c244ced7e092cb18af0a36e1b64414e28dfbbc18beabe25fe0080aa3bca",
"sha256": "7f8d9c244ced7e092cb18af0a36e1b64414e28dfbbc18beabe25fe0080aa3bca"
},
"mojave": {
"url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.0.mojave.bottle.tar.gz",
"sha256": "af859141fb9f4ecf149a4f905cca94381fb64aaddcb3a113b0f1ff1fe5d9e5b3"
"arm64_big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:f1c062ceb1c7d933edb1e94f0cb1cb1b79b33821d565d26ebfbdf805def3b8f9",
"sha256": "f1c062ceb1c7d933edb1e94f0cb1cb1b79b33821d565d26ebfbdf805def3b8f9"
},
"high_sierra": {
"url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.0.high_sierra.bottle.tar.gz",
"sha256": "6842c5c972883b6c176cf02fa8dd12b09663889369b1c9ef18201d594120b642"
"monterey": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:a3242f98aee8736737fac5091c35ed34532c6e9a7ec66532e9418731b12ce158",
"sha256": "a3242f98aee8736737fac5091c35ed34532c6e9a7ec66532e9418731b12ce158"
},
"big_sur": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:76d9cd1efe09137f656c94c6498b80c2d9d7ca1f9cbd5a98d0699aa15629bd52",
"sha256": "76d9cd1efe09137f656c94c6498b80c2d9d7ca1f9cbd5a98d0699aa15629bd52"
},
"catalina": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ac73b68d0225d794f415d5aedf0e2ffdbd1251e68e874a95f43c43431eeac518",
"sha256": "ac73b68d0225d794f415d5aedf0e2ffdbd1251e68e874a95f43c43431eeac518"
},
"x86_64_linux": {
"cellar": "/home/linuxbrew/.linuxbrew/Cellar",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:89ba5a1898f9e5ce08582cd56399d18713c4091cb2b56a91ef839420dae49096",
"sha256": "89ba5a1898f9e5ce08582cd56399d18713c4091cb2b56a91ef839420dae49096"
}
}
}
Expand Down Expand Up @@ -54,6 +72,14 @@
"CLT": "",
"Xcode": "12.3",
"macOS": "11.0.1"
},
"monterey": {
"HOMEBREW_VERSION": "3.5.8",
"HOMEBREW_PREFIX": "/opt/homebrew",
"Homebrew/homebrew-core": "802096aba4fdaa0d3cd080a2354cbce4dbe4044f",
"CLT": "13.4.0.0.1.1651278267",
"Xcode": "13.4.1",
"macOS": "12.5"
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -77,6 +77,8 @@ The changelog for **SwifterSwift**. Also see the [releases](https://github.com/S
- Added `Array.joined(separator:)` to create a new `NSAttributedString` by concatenating the elements of the sequence, adding the given separator between each element. [#985](https://github.com/SwifterSwift/SwifterSwift/pull/985) by [Roman Podymov](https://github.com/RomanPodymov).
- **UIButton**
- Added `setAttributedTitleForAllStates`, `attributedTitleForDisabled`, `attributedTitleForHighlighted`, `attributedTitleForNormal` and `attributedTitleForSelected` for convenient work with attributed strings. [#1001](https://github.com/SwifterSwift/SwifterSwift/pull/1001) by [Roman Podymov](https://github.com/RomanPodymov).
- **Digest**
- Added `hexString` to get a hexadecimal representation for all digest typed in `CryptoKit` (e.g. `SHA216Digest`, `SHA512Digest`,`MD5Digest`, ...). [#1026](https://github.com/SwifterSwift/SwifterSwift/pull/1026) by [Marco Eidinger](https://github.com/MarcoEidinger).

### Changed
- **NSAttributedString**:
Expand Down Expand Up @@ -119,9 +121,13 @@ The changelog for **SwifterSwift**. Also see the [releases](https://github.com/S
- Fixed a bug:UITextField `addPaddingLeftIcon` doesn't work on iOS 13[#876](https://github.com/SwifterSwift/SwifterSwift/issues/876) by [Jayxiang](https://github.com/Jayxiang)
- **UIImage**
- Fixed a bug:UIImage `rotated(by:)` lose origin scale, result in image blurred[#904](https://github.com/SwifterSwift/SwifterSwift/pull/904) by [yanpanpan](https://github.com/yanpanpan)
- **UIView**
- Fixed `rotate(toAngle)` to rotate _to_ an angle instead of _by_ an angle, as raised in [#935](https://github.com/SwifterSwift/SwifterSwift/pull/935). [#1019](https://github.com/SwifterSwift/SwifterSwift/pull/1019) by [guykogus](https://github.com/guykogus)
- **ColorExtension**:
- Fixed a bug: `Color.FlatUI` can be initialized. by [Shiva Huang](https://github.com/ShivaHuang)
- Fixed `Color.init?(hexString: String, transparency: CGFloat = 1)` was not handling uppercase `0X` in hex prefix [#947](https://github.com/SwifterSwift/SwifterSwift/pull/947) by [Zero.D.Saber](https://github.com/faimin)
- **URLExtension**
- Fixed `deletingAllPathComponents()` and `deleteAllPathComponents` to handle empty paths, as raised in [#1012](https://github.com/SwifterSwift/SwifterSwift/pull/1012). [#1018](https://github.com/SwifterSwift/SwifterSwift/pull/1018) by [guykogus](https://github.com/guykogus)

### Security

Expand Down

0 comments on commit 6f196d9

Please sign in to comment.