Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 9c087ea
Author: Yuri Strot <[email protected]>
Date:   Sun May 15 18:42:57 2022 +0700

    Update README.md

commit a3ddf65
Author: Yuri Strot <[email protected]>
Date:   Sun May 15 18:32:07 2022 +0700

    Add deprecation image

commit 29ec199
Merge: d508348 9797fb0
Author: Yuri Strot <[email protected]>
Date:   Thu Apr 21 16:59:18 2022 +0700

    Merge pull request exyte#781 from hotbott/master

    Native Image Scale

commit 9797fb0
Author: Sebastian Bott <[email protected]>
Date:   Thu Dec 2 17:42:55 2021 +0100

    Bump version

commit 96e4900
Author: Sebastian Bott <[email protected]>
Date:   Thu Dec 2 17:42:32 2021 +0100

    Fix native image scale

commit 197903c
Author: Sebastian Bott <[email protected]>
Date:   Thu Dec 2 17:42:08 2021 +0100

    Add render dispose

commit d508348
Author: Alisa Mylnikova <[email protected]>
Date:   Fri Oct 29 15:04:40 2021 +0700

    Bump version

commit 5cde520
Merge: f9c0972 7b54dda
Author: Yuri Strot <[email protected]>
Date:   Fri Oct 29 15:01:43 2021 +0700

    Merge pull request exyte#779 from exyte/fix/smooth-group-animation

    fix unsmooth group animation

commit 7b54dda
Author: Mark Goldin <[email protected]>
Date:   Fri Oct 29 14:57:38 2021 +0700

    fix unsmooth group animation

commit f9c0972
Author: Alisa Mylnikova <[email protected]>
Date:   Fri Oct 8 17:23:41 2021 +0700

    Bump version

commit 931cbdb
Merge: b332010 26271bc
Author: Yuri Strot <[email protected]>
Date:   Fri Oct 8 16:45:34 2021 +0700

    Merge pull request exyte#773 from exyte/fix-tests-unwrapping

    Fix image unwrapping, some crashes

commit 26271bc
Merge: 6415858 b332010
Author: Yuri Strot <[email protected]>
Date:   Fri Oct 8 16:45:19 2021 +0700

    Merge branch 'master' into fix-tests-unwrapping

commit b332010
Merge: 2b406e5 dfcfdbe
Author: Yuri Strot <[email protected]>
Date:   Fri Oct 8 16:43:17 2021 +0700

    Merge pull request exyte#772 from exyte/769-SWXMLHash-Compatibility

    exyte#769 SWXMLHash Compatibility

commit 6415858
Author: Daniil Manin <[email protected]>
Date:   Tue Oct 5 14:09:55 2021 +0700

    Update renderToImage method, optional image

commit d5ae291
Author: Daniil Manin <[email protected]>
Date:   Tue Oct 5 14:06:48 2021 +0700

    Fix test's method - to native image, add throw CommonError.invalidImageContext

commit dfcfdbe
Author: Daniil Manin <[email protected]>
Date:   Mon Oct 4 17:58:51 2021 +0700

    Update indents

commit cc7513b
Author: Daniil Manin <[email protected]>
Date:   Mon Oct 4 17:50:17 2021 +0700

    exyte#769 Update SWXMLHash
  • Loading branch information
yuzhiyou1990 committed Sep 20, 2022
1 parent 2b406e5 commit 61a9fd3
Show file tree
Hide file tree
Showing 16 changed files with 712 additions and 177 deletions.
396 changes: 294 additions & 102 deletions Dependencies/SWXMLHash/SWXMLHash.swift → Dependencies/SWXMLHash/XMLHash.swift
100755 → 100644

Large diffs are not rendered by default.

259 changes: 233 additions & 26 deletions .../SWXMLHash/SWXMLHash+TypeConversion.swift → ...XMLIndexer+XMLIndexerDeserializable.swift
100755 → 100644

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions Dependencies/SWXMLHash/shim.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// shim.swift
// SWXMLHash
//
// Copyright (c) 2018 David Mohundro
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//

#if (!swift(>=4.1) && swift(>=4.0)) || !swift(>=3.3)

extension Sequence {
func compactMap<ElementOfResult>(
_ transform: (Self.Element
) throws -> ElementOfResult?) rethrows -> [ElementOfResult] {
try flatMap(transform)
}
}

#endif
50 changes: 50 additions & 0 deletions Deprecation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Macaw.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = "Macaw"
s.version = "0.9.7"
s.version = "0.9.10"
s.summary = "Powerful and easy-to-use vector graphics library with SVG support written in Swift."

s.homepage = 'https://github.com/exyte/Macaw.git'
Expand Down
Loading

0 comments on commit 61a9fd3

Please sign in to comment.