diff --git a/CHANGELOG.md b/CHANGELOG.md index fd7ee29e..769acb71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## [2.0.0](https://github.com/jjochen/JJFloatingActionButton/tree/2.0.0) (2019-04-09) +[Full Changelog](https://github.com/jjochen/JJFloatingActionButton/compare/1.2.0...2.0.0) + +**Implemented enhancements:** + +- Swift 5 support [\#197](https://github.com/jjochen/JJFloatingActionButton/issues/197) + +**Merged pull requests:** + +- Migrate to Swift 5 [\#198](https://github.com/jjochen/JJFloatingActionButton/pull/198) [[updated](https://github.com/jjochen/JJFloatingActionButton/labels/updated)] + ## [1.2.0](https://github.com/jjochen/JJFloatingActionButton/tree/1.2.0) (2019-02-08) [Full Changelog](https://github.com/jjochen/JJFloatingActionButton/compare/1.1.0...1.2.0) diff --git a/Example/JJFloatingActionButton/Info.plist b/Example/JJFloatingActionButton/Info.plist index c836bbd1..feff096b 100644 --- a/Example/JJFloatingActionButton/Info.plist +++ b/Example/JJFloatingActionButton/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2.0 + 2.0.0 CFBundleVersion 1 LSRequiresIPhoneOS diff --git a/Example/Podfile.lock b/Example/Podfile.lock index f7dd8779..b4b28ca1 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -4,7 +4,7 @@ PODS: - iOSSnapshotTestCase/Core (5.0.2) - iOSSnapshotTestCase/SwiftSupport (5.0.2): - iOSSnapshotTestCase/Core - - JJFloatingActionButton (1.2.0) + - JJFloatingActionButton (2.0.0) - Nimble (7.3.4) - Nimble-Snapshots (6.9.1): - Nimble-Snapshots/Core (= 6.9.1) @@ -32,7 +32,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: iOSSnapshotTestCase: 2d51aa06775e95cecb0a1fb9c5c159ccd1dd4596 - JJFloatingActionButton: 8d3fc4b4c389c6984583cc371fd89deb819fa521 + JJFloatingActionButton: 93e08243951c5cc7ce7f1724289fe74cbf26ff40 Nimble: 051e3d8912d40138fa5591c78594f95fb172af37 Nimble-Snapshots: bbd1ab264bacc24a9ce24a8363bc05aac783aeb0 Quick: ce1276c7c27ba2da3cb2fd0cde053c3648b3b22d diff --git a/JJFloatingActionButton.podspec b/JJFloatingActionButton.podspec index 90f92d29..dc151500 100644 --- a/JJFloatingActionButton.podspec +++ b/JJFloatingActionButton.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'JJFloatingActionButton' - spec.version = '1.2.0' + spec.version = '2.0.0' spec.swift_version = '5.0' spec.author = { 'Jochen Pfeiffer' => 'pod@jochen-pfeiffer.com' } spec.license = { :type => 'MIT', :file => 'LICENSE' } diff --git a/docs/Classes.html b/docs/Classes.html index fb4787b8..2b5e59bd 100644 --- a/docs/Classes.html +++ b/docs/Classes.html @@ -435,8 +435,8 @@

Declaration

diff --git a/docs/Classes/JJActionItem.html b/docs/Classes/JJActionItem.html index c59261fd..5606c224 100644 --- a/docs/Classes/JJActionItem.html +++ b/docs/Classes/JJActionItem.html @@ -673,8 +673,8 @@

Declaration

diff --git a/docs/Classes/JJAnimationSettings.html b/docs/Classes/JJAnimationSettings.html index c4f8f7d4..569dfa7a 100644 --- a/docs/Classes/JJAnimationSettings.html +++ b/docs/Classes/JJAnimationSettings.html @@ -353,8 +353,8 @@

Return Value

diff --git a/docs/Classes/JJButtonAnimationConfiguration.html b/docs/Classes/JJButtonAnimationConfiguration.html index db521088..927d1f4a 100644 --- a/docs/Classes/JJButtonAnimationConfiguration.html +++ b/docs/Classes/JJButtonAnimationConfiguration.html @@ -495,8 +495,8 @@

Return Value

diff --git a/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html b/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html index e41ad0a1..6856b462 100644 --- a/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html +++ b/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html @@ -186,8 +186,8 @@

Declaration

diff --git a/docs/Classes/JJCircleView.html b/docs/Classes/JJCircleView.html index f483dd48..50715024 100644 --- a/docs/Classes/JJCircleView.html +++ b/docs/Classes/JJCircleView.html @@ -298,8 +298,8 @@

Declaration

diff --git a/docs/Classes/JJFloatingActionButton.html b/docs/Classes/JJFloatingActionButton.html index 5e32fd34..dc2f4f7c 100644 --- a/docs/Classes/JJFloatingActionButton.html +++ b/docs/Classes/JJFloatingActionButton.html @@ -546,7 +546,9 @@

Declaration

Swift

@objc
-public internal(set) var buttonState: JJFloatingActionButtonState
+public internal(set) var buttonState: JJFloatingActionButtonState { + get + }
@@ -1613,8 +1615,8 @@

Declaration

diff --git a/docs/Classes/JJItemAnimationConfiguration.html b/docs/Classes/JJItemAnimationConfiguration.html index 32cf92ed..795c2dc9 100644 --- a/docs/Classes/JJItemAnimationConfiguration.html +++ b/docs/Classes/JJItemAnimationConfiguration.html @@ -526,8 +526,8 @@

Return Value

diff --git a/docs/Classes/JJItemLayout.html b/docs/Classes/JJItemLayout.html index c337414c..45eaee00 100644 --- a/docs/Classes/JJItemLayout.html +++ b/docs/Classes/JJItemLayout.html @@ -211,8 +211,8 @@

Return Value

diff --git a/docs/Classes/JJItemPreparation.html b/docs/Classes/JJItemPreparation.html index aac55ad0..ff9ded01 100644 --- a/docs/Classes/JJItemPreparation.html +++ b/docs/Classes/JJItemPreparation.html @@ -214,8 +214,8 @@

Return Value

diff --git a/docs/Enums.html b/docs/Enums.html index e25315b9..4785d394 100644 --- a/docs/Enums.html +++ b/docs/Enums.html @@ -187,8 +187,8 @@

Declaration

diff --git a/docs/Enums/JJActionItemTitlePosition.html b/docs/Enums/JJActionItemTitlePosition.html index 0a791448..4735f400 100644 --- a/docs/Enums/JJActionItemTitlePosition.html +++ b/docs/Enums/JJActionItemTitlePosition.html @@ -321,8 +321,8 @@

Declaration

diff --git a/docs/Enums/JJFloatingActionButtonState.html b/docs/Enums/JJFloatingActionButtonState.html index daad344d..cbee7497 100644 --- a/docs/Enums/JJFloatingActionButtonState.html +++ b/docs/Enums/JJFloatingActionButtonState.html @@ -240,8 +240,8 @@

Declaration

diff --git a/docs/Protocols.html b/docs/Protocols.html index 60113df5..8a9234f4 100644 --- a/docs/Protocols.html +++ b/docs/Protocols.html @@ -154,8 +154,8 @@

Declaration

diff --git a/docs/Protocols/JJFloatingActionButtonDelegate.html b/docs/Protocols/JJFloatingActionButtonDelegate.html index a5d9dcfc..6bfc8382 100644 --- a/docs/Protocols/JJFloatingActionButtonDelegate.html +++ b/docs/Protocols/JJFloatingActionButtonDelegate.html @@ -244,8 +244,8 @@

Declaration

diff --git a/docs/css/jazzy.css b/docs/css/jazzy.css index 24cfe4ae..c83db5bf 100644 --- a/docs/css/jazzy.css +++ b/docs/css/jazzy.css @@ -63,10 +63,6 @@ a { a:hover, a:focus { outline: 0; text-decoration: underline; } - a.discouraged { - text-decoration: line-through; } - a.discouraged:hover, a.discouraged:focus { - text-decoration: underline line-through; } table { background: #fff; @@ -229,7 +225,7 @@ pre code { .item a[name]:before { content: ""; display: block; } - .item .token, .item .direct-link { + .item .token { padding-left: 3px; margin-left: 0px; font-size: 1rem; } @@ -291,9 +287,9 @@ pre code { .language .aside-title { color: #4183c4; } -.aside-warning, .aside-deprecated, .aside-unavailable { +.aside-warning { border-left: 5px solid #ff6666; } - .aside-warning .aside-title, .aside-deprecated .aside-title, .aside-unavailable .aside-title { + .aside-warning .aside-title { color: #ff0000; } .graybox { diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes.html index fb4787b8..2b5e59bd 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes.html @@ -435,8 +435,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJActionItem.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJActionItem.html index c59261fd..5606c224 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJActionItem.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJActionItem.html @@ -673,8 +673,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJAnimationSettings.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJAnimationSettings.html index c4f8f7d4..569dfa7a 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJAnimationSettings.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJAnimationSettings.html @@ -353,8 +353,8 @@

Return Value

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration.html index db521088..927d1f4a 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration.html @@ -495,8 +495,8 @@

Return Value

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html index e41ad0a1..6856b462 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html @@ -186,8 +186,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJCircleView.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJCircleView.html index f483dd48..50715024 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJCircleView.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJCircleView.html @@ -298,8 +298,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJFloatingActionButton.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJFloatingActionButton.html index 5e32fd34..dc2f4f7c 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJFloatingActionButton.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJFloatingActionButton.html @@ -546,7 +546,9 @@

Declaration

Swift

@objc
-public internal(set) var buttonState: JJFloatingActionButtonState
+public internal(set) var buttonState: JJFloatingActionButtonState { + get + }
@@ -1613,8 +1615,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemAnimationConfiguration.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemAnimationConfiguration.html index 32cf92ed..795c2dc9 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemAnimationConfiguration.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemAnimationConfiguration.html @@ -526,8 +526,8 @@

Return Value

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemLayout.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemLayout.html index c337414c..45eaee00 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemLayout.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemLayout.html @@ -211,8 +211,8 @@

Return Value

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemPreparation.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemPreparation.html index aac55ad0..ff9ded01 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemPreparation.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Classes/JJItemPreparation.html @@ -214,8 +214,8 @@

Return Value

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums.html index e25315b9..4785d394 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums.html @@ -187,8 +187,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJActionItemTitlePosition.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJActionItemTitlePosition.html index 0a791448..4735f400 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJActionItemTitlePosition.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJActionItemTitlePosition.html @@ -321,8 +321,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJFloatingActionButtonState.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJFloatingActionButtonState.html index daad344d..cbee7497 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJFloatingActionButtonState.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Enums/JJFloatingActionButtonState.html @@ -240,8 +240,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols.html index 60113df5..8a9234f4 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols.html @@ -154,8 +154,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols/JJFloatingActionButtonDelegate.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols/JJFloatingActionButtonDelegate.html index a5d9dcfc..6bfc8382 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols/JJFloatingActionButtonDelegate.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/Protocols/JJFloatingActionButtonDelegate.html @@ -244,8 +244,8 @@

Declaration

diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/css/jazzy.css b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/css/jazzy.css index 24cfe4ae..c83db5bf 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/css/jazzy.css +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/css/jazzy.css @@ -63,10 +63,6 @@ a { a:hover, a:focus { outline: 0; text-decoration: underline; } - a.discouraged { - text-decoration: line-through; } - a.discouraged:hover, a.discouraged:focus { - text-decoration: underline line-through; } table { background: #fff; @@ -229,7 +225,7 @@ pre code { .item a[name]:before { content: ""; display: block; } - .item .token, .item .direct-link { + .item .token { padding-left: 3px; margin-left: 0px; font-size: 1rem; } @@ -291,9 +287,9 @@ pre code { .language .aside-title { color: #4183c4; } -.aside-warning, .aside-deprecated, .aside-unavailable { +.aside-warning { border-left: 5px solid #ff6666; } - .aside-warning .aside-title, .aside-deprecated .aside-title, .aside-unavailable .aside-title { + .aside-warning .aside-title { color: #ff0000; } .graybox { diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/index.html b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/index.html index 5b0a913e..b7240c98 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/index.html +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/index.html @@ -280,8 +280,8 @@

License< diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/js/jazzy.search.js b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/js/jazzy.search.js index 84c08519..54be83cf 100644 --- a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/js/jazzy.search.js +++ b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/Documents/js/jazzy.search.js @@ -2,7 +2,6 @@ $(function(){ var searchIndex = lunr(function() { this.ref('url'); this.field('name'); - this.field('abstract'); }); var $typeahead = $('[data-typeahead]'); @@ -28,7 +27,7 @@ $(function(){ $.getJSON(searchURL).then(function(searchData) { $.each(searchData, function (url, doc) { - searchIndex.add({url: url, name: doc.name, abstract: doc.abstract}); + searchIndex.add({url: url, name: doc.name}); }); $typeahead.typeahead( diff --git a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/docSet.dsidx b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/docSet.dsidx index 50fdd91b..76bbd75f 100644 Binary files a/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/docSet.dsidx and b/docs/docsets/JJFloatingActionButton.docset/Contents/Resources/docSet.dsidx differ diff --git a/docs/docsets/JJFloatingActionButton.tgz b/docs/docsets/JJFloatingActionButton.tgz index 0134fee9..60c271e4 100644 Binary files a/docs/docsets/JJFloatingActionButton.tgz and b/docs/docsets/JJFloatingActionButton.tgz differ diff --git a/docs/docsets/JJFloatingActionButton.xml b/docs/docsets/JJFloatingActionButton.xml index 59cc9da0..57dbfd22 100644 --- a/docs/docsets/JJFloatingActionButton.xml +++ b/docs/docsets/JJFloatingActionButton.xml @@ -1 +1 @@ -1.2.0https://jjochen.github.io/JJFloatingActionButton/docsets/JJFloatingActionButton.tgz +2.0.0https://jjochen.github.io/JJFloatingActionButton/docsets/JJFloatingActionButton.tgz diff --git a/docs/index.html b/docs/index.html index 5b0a913e..b7240c98 100644 --- a/docs/index.html +++ b/docs/index.html @@ -280,8 +280,8 @@

License< diff --git a/docs/js/jazzy.search.js b/docs/js/jazzy.search.js index 84c08519..54be83cf 100644 --- a/docs/js/jazzy.search.js +++ b/docs/js/jazzy.search.js @@ -2,7 +2,6 @@ $(function(){ var searchIndex = lunr(function() { this.ref('url'); this.field('name'); - this.field('abstract'); }); var $typeahead = $('[data-typeahead]'); @@ -28,7 +27,7 @@ $(function(){ $.getJSON(searchURL).then(function(searchData) { $.each(searchData, function (url, doc) { - searchIndex.add({url: url, name: doc.name, abstract: doc.abstract}); + searchIndex.add({url: url, name: doc.name}); }); $typeahead.typeahead(