From e7753a02aaabfd28227933304926496573192762 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 01:53:23 +0900 Subject: [PATCH 01/13] Update DifferenceKit --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/DifferenceKit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile b/Cartfile index cd3d7dc..02c9537 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ra1028/DifferenceKit" ~> 1.0.0 +github "ra1028/DifferenceKit" ~> 1.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index ee0b20b..eddda61 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ra1028/DifferenceKit" "1.0.0" +github "ra1028/DifferenceKit" "1.1.0" diff --git a/Carthage/Checkouts/DifferenceKit b/Carthage/Checkouts/DifferenceKit index fcb2953..d85cf1a 160000 --- a/Carthage/Checkouts/DifferenceKit +++ b/Carthage/Checkouts/DifferenceKit @@ -1 +1 @@ -Subproject commit fcb295369cb217a70b62610f3c46fbecca86f4ad +Subproject commit d85cf1af931e7eab14e9bde75e8a0b279a686321 From 0f00efb2160f160aac1a16c3c3ab6658ea9febe0 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 01:59:53 +0900 Subject: [PATCH 02/13] Migrate with Xcode10.2 --- Carbon.xcodeproj/project.pbxproj | 11 +++++++---- Sources/Adapters/UICollectionViewAdapter.swift | 4 ++-- Sources/Adapters/UITableViewAdapter.swift | 4 ++-- Sources/Internal/ComponentContainer.swift | 6 +++--- XCConfigs/Carbon.xcconfig | 1 - 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Carbon.xcodeproj/project.pbxproj b/Carbon.xcodeproj/project.pbxproj index 738555c..33d1507 100644 --- a/Carbon.xcodeproj/project.pbxproj +++ b/Carbon.xcodeproj/project.pbxproj @@ -363,9 +363,11 @@ TargetAttributes = { 6B65947921E252E300291AAF = { CreatedOnToolsVersion = 10.1; + LastSwiftMigration = 1020; }; 6B7ADEAD21F783E3003803BE = { CreatedOnToolsVersion = 10.1; + LastSwiftMigration = 1020; }; }; }; @@ -375,6 +377,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 6B65947021E252E300291AAF; productRefGroup = 6B65947B21E252E300291AAF /* Products */; @@ -645,7 +648,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -675,7 +678,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -695,7 +698,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ryo.Tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -715,7 +718,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ryo.Tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Sources/Adapters/UICollectionViewAdapter.swift b/Sources/Adapters/UICollectionViewAdapter.swift index 5607e9e..ae92f1c 100644 --- a/Sources/Adapters/UICollectionViewAdapter.swift +++ b/Sources/Adapters/UICollectionViewAdapter.swift @@ -34,7 +34,7 @@ open class UICollectionViewAdapter: NSObject, Adapter { public extension UICollectionViewAdapter { /// The configuration for the classes of elements in `UICollectionView`. - public struct Config { + struct Config { /// The default configuration. public static var `default` = Config() @@ -67,7 +67,7 @@ public extension UICollectionViewAdapter { public extension UICollectionViewAdapter { /// Context when cell is selected. - public struct SelectionContext { + struct SelectionContext { /// A collection view of the selected cell. public var collectionView: UICollectionView diff --git a/Sources/Adapters/UITableViewAdapter.swift b/Sources/Adapters/UITableViewAdapter.swift index 3702df4..754d0bc 100644 --- a/Sources/Adapters/UITableViewAdapter.swift +++ b/Sources/Adapters/UITableViewAdapter.swift @@ -31,7 +31,7 @@ open class UITableViewAdapter: NSObject, Adapter { public extension UITableViewAdapter { /// The configuration for the classes of elements in `UITableView`. - public struct Config { + struct Config { /// The default configuration. public static var `default` = Config() @@ -64,7 +64,7 @@ public extension UITableViewAdapter { public extension UITableViewAdapter { /// Context when cell is selected. - public struct SelectionContext { + struct SelectionContext { /// A table view of the selected cell. public var tableView: UITableView diff --git a/Sources/Internal/ComponentContainer.swift b/Sources/Internal/ComponentContainer.swift index 81e0203..13c4d29 100644 --- a/Sources/Internal/ComponentContainer.swift +++ b/Sources/Internal/ComponentContainer.swift @@ -10,19 +10,19 @@ internal protocol ComponentContainer: class { } internal extension ComponentContainer { - internal func contentWillDisplay() { + func contentWillDisplay() { guard let content = renderedContent else { return } renderedComponent?.contentWillDisplay(content) } - internal func contentDidEndDisplay() { + func contentDidEndDisplay() { guard let content = renderedContent else { return } renderedComponent?.contentDidEndDisplay(content) } - internal func render(component: AnyComponent) { + func render(component: AnyComponent) { switch (renderedContent, renderedComponent) { case (let content?, let renderedComponent?) where !renderedComponent.shouldRender(next: component, in: content): break diff --git a/XCConfigs/Carbon.xcconfig b/XCConfigs/Carbon.xcconfig index 48763c6..71ca2d4 100644 --- a/XCConfigs/Carbon.xcconfig +++ b/XCConfigs/Carbon.xcconfig @@ -16,4 +16,3 @@ DYLIB_CURRENT_VERSION = 1 DYLIB_INSTALL_NAME_BASE = @rpath LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks DEFINES_MODULE = NO -APPLICATION_EXTENSION_API_ONLY = YES \ No newline at end of file From aec9a96912362359328ea5ec1003a4a2c06fdb9a Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:00:39 +0900 Subject: [PATCH 03/13] Use Swift version 4.2 compatibility mode --- Carbon.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Carbon.xcodeproj/project.pbxproj b/Carbon.xcodeproj/project.pbxproj index 33d1507..7155167 100644 --- a/Carbon.xcodeproj/project.pbxproj +++ b/Carbon.xcodeproj/project.pbxproj @@ -648,7 +648,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -678,7 +678,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -698,7 +698,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ryo.Tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -718,7 +718,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ryo.Tests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; From 492300f7ff7e91d7968c0d837a052760ea3614dc Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:04:07 +0900 Subject: [PATCH 04/13] Update travis ci setting --- .travis.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba07918..1d673c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,20 @@ -env: - global: - - LC_CTYPE=en_US.UTF-8 +aliases: + - &testing_xcode + os: osx + language: objective-c + install: + - ./scripts/install_swiftlint.sh + script: + - set -o pipefail + - xcodebuild build-for-testing test-without-building -workspace Carbon.xcworkspace -scheme Carbon -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X' ENABLE_TESTABILITY=YES | xcpretty - c + matrix: include: - - os: osx - language: objective-c + - <<: *testing_xcode osx_image: xcode10.1 - install: - - ./scripts/install_swiftlint.sh - script: - - xcodebuild build-for-testing test-without-building -workspace Carbon.xcworkspace -scheme Carbon -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X' ENABLE_TESTABILITY=YES | xcpretty - c + + - <<: *testing_xcode + osx_image: xcode10.2 notifications: email: false \ No newline at end of file From 426d433a6c912b8ab3d4dc18dd85c2d616aabf08 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:05:42 +0900 Subject: [PATCH 05/13] Update podspec --- Carbon.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Carbon.podspec b/Carbon.podspec index 8f4e36c..1ed311c 100644 --- a/Carbon.podspec +++ b/Carbon.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Carbon' - spec.version = '0.1.0' + spec.version = '0.2.0' spec.author = { 'ra1028' => 'r.fe51028.r@gmail.com' } spec.homepage = 'https://github.com/ra1028/Carbon' spec.documentation_url = 'https://ra1028.github.io/Carbon' @@ -11,6 +11,6 @@ Pod::Spec.new do |spec| spec.requires_arc = true spec.swift_version = '4.2' spec.ios.deployment_target = '10.0' - spec.dependency 'DifferenceKit/Core', "~> 1.0.0" + spec.dependency 'DifferenceKit/Core', "~> 1.1" spec.ios.frameworks = 'UIKit' end From 21f41e9189c41af020a89f88660295082a7ec5a6 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:07:21 +0900 Subject: [PATCH 06/13] Update gems --- Gemfile | 2 +- Gemfile.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 29afbc5..d6d1149 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source "https://rubygems.org" -gem 'cocoapods', '1.6.0' +gem 'cocoapods', '1.6.1' gem 'jazzy', '0.9.4' diff --git a/Gemfile.lock b/Gemfile.lock index add42c6..3d15ae1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,17 +2,17 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.6.0) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.0) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -26,13 +26,13 @@ GEM gh_inspector (~> 1.0) molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.3, >= 1.3.1) - xcodeproj (>= 1.8.0, < 2.0) - cocoapods-core (1.6.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) + cocoapods-deintegrate (1.0.3) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap @@ -43,7 +43,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) escape (0.0.4) ffi (1.10.0) fourflusher (2.2.0) @@ -73,7 +73,7 @@ GEM ffi (~> 1.0) redcarpet (3.4.0) rouge (3.3.0) - ruby-macho (1.3.1) + ruby-macho (1.4.0) sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -85,7 +85,7 @@ GEM thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.8.0) + xcodeproj (1.8.1) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -96,7 +96,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.6.0) + cocoapods (= 1.6.1) jazzy (= 0.9.4) BUNDLED WITH From df0fa954aadf13ac76f827f67a6bf01797622bd0 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:15:09 +0900 Subject: [PATCH 07/13] Fix playground --- Carbon.playground/Contents.swift | 14 +++++++------- Carbon.playground/contents.xcplayground | 2 +- .../contents.xcworkspacedata | 7 +++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ Carbon.xcworkspace/contents.xcworkspacedata | 2 +- 5 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 Carbon.playground/playground.xcworkspace/contents.xcworkspacedata create mode 100644 Carbon.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Carbon.playground/Contents.swift b/Carbon.playground/Contents.swift index cb98fe6..90c867e 100644 --- a/Carbon.playground/Contents.swift +++ b/Carbon.playground/Contents.swift @@ -51,10 +51,10 @@ renderer.render( id: 1, header: ViewNode(Label(text: "Header 1")), cells: [ - CellNode(id: 1, component: Label(text: "Cell 1")), - CellNode(id: 2, component: Label(text: "Cell 2")), - CellNode(id: 3, component: Label(text: "Cell 3")), - CellNode(id: 4, component: Label(text: "Cell 4")) + CellNode(id: 1, Label(text: "Cell 1")), + CellNode(id: 2, Label(text: "Cell 2")), + CellNode(id: 3, Label(text: "Cell 3")), + CellNode(id: 4, Label(text: "Cell 4")) ], footer: ViewNode(Label(text: "Footer 1")) ), @@ -62,9 +62,9 @@ renderer.render( id: 2, header: ViewNode(Label(text: "Header 2")), cells: [ - CellNode(id: 5, component: Label(text: "Cell 5")), - CellNode(id: 6, component: Label(text: "Cell 6")), - CellNode(id: 7, component: Label(text: "Cell 7")) + CellNode(id: 5, Label(text: "Cell 5")), + CellNode(id: 6, Label(text: "Cell 6")), + CellNode(id: 7, Label(text: "Cell 7")) ], footer: ViewNode(Label(text: "Footer 2")) ) diff --git a/Carbon.playground/contents.xcplayground b/Carbon.playground/contents.xcplayground index 2c597bb..89da2d4 100644 --- a/Carbon.playground/contents.xcplayground +++ b/Carbon.playground/contents.xcplayground @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Carbon.playground/playground.xcworkspace/contents.xcworkspacedata b/Carbon.playground/playground.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/Carbon.playground/playground.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Carbon.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Carbon.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Carbon.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Carbon.xcworkspace/contents.xcworkspacedata b/Carbon.xcworkspace/contents.xcworkspacedata index ace285e..7f05e14 100644 --- a/Carbon.xcworkspace/contents.xcworkspacedata +++ b/Carbon.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:Carbon.playground"> From 7bbaeef0a5d0745246d90932804c336744962045 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:16:37 +0900 Subject: [PATCH 08/13] Update language badge in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e71a4a0..c28136b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ in UITableView and UICollectionView.

-Swift4.2 +Swift5 Release CocoaPods Carthage @@ -484,4 +484,4 @@ Libraries for list UIs using diffing algorithm that I have sincerely ❤️ and ## License -Carbon is released under the [Apache 2.0 License](https://github.com/ra1028/Carbon/blob/master/LICENSE). \ No newline at end of file +Carbon is released under the [Apache 2.0 License](https://github.com/ra1028/Carbon/blob/master/LICENSE). From 7f39a60bc28c773b316d9d0a70767eddba8a07e4 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:22:52 +0900 Subject: [PATCH 09/13] Fix asset --- .../KyotoBy\305\215d\305\215In.imageset/Contents.json" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/Examples/Example-iOS/Sources/Assets.xcassets/KyotoBy\305\215d\305\215In.imageset/Contents.json" "b/Examples/Example-iOS/Sources/Assets.xcassets/KyotoBy\305\215d\305\215In.imageset/Contents.json" index 96d816c..9052949 100644 --- "a/Examples/Example-iOS/Sources/Assets.xcassets/KyotoBy\305\215d\305\215In.imageset/Contents.json" +++ "b/Examples/Example-iOS/Sources/Assets.xcassets/KyotoBy\305\215d\305\215In.imageset/Contents.json" @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "KyotoByōdōIn.jpg" + "filename" : "KyotoByōdōIn.jpg" } ], "info" : { From a45c2365848f11e90bcde62af259031cc0031baa Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:23:51 +0900 Subject: [PATCH 10/13] Migrate with Xcode10.2 --- Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj b/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj index bb80a7c..46c635f 100644 --- a/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj +++ b/Examples/Example-iOS/Example-iOS.xcodeproj/project.pbxproj @@ -351,6 +351,7 @@ TargetAttributes = { 6B6594CB21E2619B00291AAF = { CreatedOnToolsVersion = 10.1; + LastSwiftMigration = 1020; }; }; }; From 0c4f95685c00afd2cfec77a6989d0d4ff7c53e0d Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:31:05 +0900 Subject: [PATCH 11/13] Update docs --- docs/Adapters.html | 2 +- docs/Changesets.html | 2 +- docs/Classes/Renderer.html | 2 +- docs/Classes/UICollectionComponentReusableView.html | 2 +- docs/Classes/UICollectionViewAdapter.html | 6 +++--- docs/Classes/UICollectionViewAdapter/Config.html | 4 ++-- docs/Classes/UICollectionViewAdapter/SelectionContext.html | 4 ++-- docs/Classes/UICollectionViewComponentCell.html | 2 +- docs/Classes/UICollectionViewFlowLayoutAdapter.html | 2 +- docs/Classes/UICollectionViewReloadDataUpdater.html | 2 +- docs/Classes/UICollectionViewUpdater.html | 2 +- docs/Classes/UITableViewAdapter.html | 6 +++--- docs/Classes/UITableViewAdapter/Config.html | 4 ++-- docs/Classes/UITableViewAdapter/SelectionContext.html | 4 ++-- docs/Classes/UITableViewComponentCell.html | 2 +- docs/Classes/UITableViewComponentHeaderFooterView.html | 2 +- docs/Classes/UITableViewReloadDataUpdater.html | 2 +- docs/Classes/UITableViewUpdater.html | 2 +- docs/Components.html | 2 +- docs/Content Protocols.html | 2 +- docs/Interfaces.html | 2 +- docs/Nodes.html | 2 +- docs/Protocols/Adapter.html | 2 +- docs/Protocols/Component.html | 2 +- docs/Protocols/IdentifiableComponent.html | 2 +- docs/Protocols/UICollectionReusableViewContent.html | 2 +- docs/Protocols/UICollectionViewCellContent.html | 2 +- docs/Protocols/UITableViewCellContent.html | 2 +- docs/Protocols/UITableViewHeaderFooterViewContent.html | 2 +- docs/Protocols/Updater.html | 2 +- docs/Renderer.html | 2 +- docs/Section.html | 2 +- docs/Structs/AnyComponent.html | 2 +- docs/Structs/CellNode.html | 2 +- docs/Structs/Section.html | 2 +- docs/Structs/ViewNode.html | 2 +- docs/Updaters.html | 2 +- docs/index.html | 4 ++-- 38 files changed, 47 insertions(+), 47 deletions(-) diff --git a/docs/Adapters.html b/docs/Adapters.html index 59ac8fb..cd60eee 100644 --- a/docs/Adapters.html +++ b/docs/Adapters.html @@ -346,7 +346,7 @@

Declaration

diff --git a/docs/Changesets.html b/docs/Changesets.html index e6426c6..5dacc11 100644 --- a/docs/Changesets.html +++ b/docs/Changesets.html @@ -263,7 +263,7 @@

Declaration

diff --git a/docs/Classes/Renderer.html b/docs/Classes/Renderer.html index 645537d..3150850 100644 --- a/docs/Classes/Renderer.html +++ b/docs/Classes/Renderer.html @@ -614,7 +614,7 @@

Parameters

diff --git a/docs/Classes/UICollectionComponentReusableView.html b/docs/Classes/UICollectionComponentReusableView.html index 87e3be0..a1d9a3e 100644 --- a/docs/Classes/UICollectionComponentReusableView.html +++ b/docs/Classes/UICollectionComponentReusableView.html @@ -377,7 +377,7 @@

Declaration

diff --git a/docs/Classes/UICollectionViewAdapter.html b/docs/Classes/UICollectionViewAdapter.html index ccc3cc2..d32c96e 100644 --- a/docs/Classes/UICollectionViewAdapter.html +++ b/docs/Classes/UICollectionViewAdapter.html @@ -378,7 +378,7 @@

Parameters

Declaration

Swift

-
public struct Config
+
struct Config
@@ -410,7 +410,7 @@

Declaration

Declaration

Swift

-
public struct SelectionContext
+
struct SelectionContext
@@ -676,7 +676,7 @@

Declaration

diff --git a/docs/Classes/UICollectionViewAdapter/Config.html b/docs/Classes/UICollectionViewAdapter/Config.html index 00ce5b8..0f23639 100644 --- a/docs/Classes/UICollectionViewAdapter/Config.html +++ b/docs/Classes/UICollectionViewAdapter/Config.html @@ -194,7 +194,7 @@

Config

-
public struct Config
+
struct Config
@@ -397,7 +397,7 @@

Parameters

diff --git a/docs/Classes/UICollectionViewAdapter/SelectionContext.html b/docs/Classes/UICollectionViewAdapter/SelectionContext.html index 14b0e5f..f0e51f7 100644 --- a/docs/Classes/UICollectionViewAdapter/SelectionContext.html +++ b/docs/Classes/UICollectionViewAdapter/SelectionContext.html @@ -194,7 +194,7 @@

SelectionContext

-
public struct SelectionContext
+
struct SelectionContext
@@ -296,7 +296,7 @@

Declaration

diff --git a/docs/Classes/UICollectionViewComponentCell.html b/docs/Classes/UICollectionViewComponentCell.html index 4fab41e..a91ba27 100644 --- a/docs/Classes/UICollectionViewComponentCell.html +++ b/docs/Classes/UICollectionViewComponentCell.html @@ -431,7 +431,7 @@

Declaration

diff --git a/docs/Classes/UICollectionViewFlowLayoutAdapter.html b/docs/Classes/UICollectionViewFlowLayoutAdapter.html index ad788d0..4363600 100644 --- a/docs/Classes/UICollectionViewFlowLayoutAdapter.html +++ b/docs/Classes/UICollectionViewFlowLayoutAdapter.html @@ -296,7 +296,7 @@

Declaration

diff --git a/docs/Classes/UICollectionViewReloadDataUpdater.html b/docs/Classes/UICollectionViewReloadDataUpdater.html index 0848c7b..1cebe86 100644 --- a/docs/Classes/UICollectionViewReloadDataUpdater.html +++ b/docs/Classes/UICollectionViewReloadDataUpdater.html @@ -383,7 +383,7 @@

Parameters

diff --git a/docs/Classes/UICollectionViewUpdater.html b/docs/Classes/UICollectionViewUpdater.html index 3922954..400f132 100644 --- a/docs/Classes/UICollectionViewUpdater.html +++ b/docs/Classes/UICollectionViewUpdater.html @@ -644,7 +644,7 @@

Parameters

diff --git a/docs/Classes/UITableViewAdapter.html b/docs/Classes/UITableViewAdapter.html index 2613884..64ebe3f 100644 --- a/docs/Classes/UITableViewAdapter.html +++ b/docs/Classes/UITableViewAdapter.html @@ -378,7 +378,7 @@

Parameters

Declaration

Swift

-
public struct Config
+
struct Config
@@ -410,7 +410,7 @@

Declaration

Declaration

Swift

-
public struct SelectionContext
+
struct SelectionContext
@@ -919,7 +919,7 @@

Declaration

diff --git a/docs/Classes/UITableViewAdapter/Config.html b/docs/Classes/UITableViewAdapter/Config.html index 19f81d7..012f97d 100644 --- a/docs/Classes/UITableViewAdapter/Config.html +++ b/docs/Classes/UITableViewAdapter/Config.html @@ -194,7 +194,7 @@

Config

-
public struct Config
+
struct Config
@@ -397,7 +397,7 @@

Parameters

diff --git a/docs/Classes/UITableViewAdapter/SelectionContext.html b/docs/Classes/UITableViewAdapter/SelectionContext.html index a6e1ab8..6c8f2a2 100644 --- a/docs/Classes/UITableViewAdapter/SelectionContext.html +++ b/docs/Classes/UITableViewAdapter/SelectionContext.html @@ -194,7 +194,7 @@

SelectionContext

-
public struct SelectionContext
+
struct SelectionContext
@@ -296,7 +296,7 @@

Declaration

diff --git a/docs/Classes/UITableViewComponentCell.html b/docs/Classes/UITableViewComponentCell.html index 38aa7d8..0d8fb76 100644 --- a/docs/Classes/UITableViewComponentCell.html +++ b/docs/Classes/UITableViewComponentCell.html @@ -458,7 +458,7 @@

Declaration

diff --git a/docs/Classes/UITableViewComponentHeaderFooterView.html b/docs/Classes/UITableViewComponentHeaderFooterView.html index 59ee67a..769b1ee 100644 --- a/docs/Classes/UITableViewComponentHeaderFooterView.html +++ b/docs/Classes/UITableViewComponentHeaderFooterView.html @@ -377,7 +377,7 @@

Declaration

diff --git a/docs/Classes/UITableViewReloadDataUpdater.html b/docs/Classes/UITableViewReloadDataUpdater.html index 23bb5d3..0dd00d7 100644 --- a/docs/Classes/UITableViewReloadDataUpdater.html +++ b/docs/Classes/UITableViewReloadDataUpdater.html @@ -383,7 +383,7 @@

Parameters

diff --git a/docs/Classes/UITableViewUpdater.html b/docs/Classes/UITableViewUpdater.html index 398bea3..234a94c 100644 --- a/docs/Classes/UITableViewUpdater.html +++ b/docs/Classes/UITableViewUpdater.html @@ -833,7 +833,7 @@

Parameters

diff --git a/docs/Components.html b/docs/Components.html index bcbd1c1..c0beb76 100644 --- a/docs/Components.html +++ b/docs/Components.html @@ -353,7 +353,7 @@

Declaration

diff --git a/docs/Content Protocols.html b/docs/Content Protocols.html index 277f93e..d654df6 100644 --- a/docs/Content Protocols.html +++ b/docs/Content Protocols.html @@ -348,7 +348,7 @@

Declaration

diff --git a/docs/Interfaces.html b/docs/Interfaces.html index 53b0650..d10a0ef 100644 --- a/docs/Interfaces.html +++ b/docs/Interfaces.html @@ -332,7 +332,7 @@

Declaration

diff --git a/docs/Nodes.html b/docs/Nodes.html index 80f4faa..b120bfe 100644 --- a/docs/Nodes.html +++ b/docs/Nodes.html @@ -272,7 +272,7 @@

Declaration

diff --git a/docs/Protocols/Adapter.html b/docs/Protocols/Adapter.html index 6cd4a48..05e17b4 100644 --- a/docs/Protocols/Adapter.html +++ b/docs/Protocols/Adapter.html @@ -382,7 +382,7 @@

Return Value

diff --git a/docs/Protocols/Component.html b/docs/Protocols/Component.html index 562e7cb..c97f9ac 100644 --- a/docs/Protocols/Component.html +++ b/docs/Protocols/Component.html @@ -691,7 +691,7 @@

Declaration

diff --git a/docs/Protocols/IdentifiableComponent.html b/docs/Protocols/IdentifiableComponent.html index 4455b2e..bd37fe6 100644 --- a/docs/Protocols/IdentifiableComponent.html +++ b/docs/Protocols/IdentifiableComponent.html @@ -304,7 +304,7 @@

Declaration

diff --git a/docs/Protocols/UICollectionReusableViewContent.html b/docs/Protocols/UICollectionReusableViewContent.html index fb323cd..9d25c31 100644 --- a/docs/Protocols/UICollectionReusableViewContent.html +++ b/docs/Protocols/UICollectionReusableViewContent.html @@ -324,7 +324,7 @@

Declaration

diff --git a/docs/Protocols/UICollectionViewCellContent.html b/docs/Protocols/UICollectionViewCellContent.html index b7bd222..0e6a1f4 100644 --- a/docs/Protocols/UICollectionViewCellContent.html +++ b/docs/Protocols/UICollectionViewCellContent.html @@ -456,7 +456,7 @@

Parameters

diff --git a/docs/Protocols/UITableViewCellContent.html b/docs/Protocols/UITableViewCellContent.html index 5f86a38..95608ca 100644 --- a/docs/Protocols/UITableViewCellContent.html +++ b/docs/Protocols/UITableViewCellContent.html @@ -558,7 +558,7 @@

Parameters

diff --git a/docs/Protocols/UITableViewHeaderFooterViewContent.html b/docs/Protocols/UITableViewHeaderFooterViewContent.html index 915c3a9..2e2fb23 100644 --- a/docs/Protocols/UITableViewHeaderFooterViewContent.html +++ b/docs/Protocols/UITableViewHeaderFooterViewContent.html @@ -324,7 +324,7 @@

Declaration

diff --git a/docs/Protocols/Updater.html b/docs/Protocols/Updater.html index c59c608..e0bd35e 100644 --- a/docs/Protocols/Updater.html +++ b/docs/Protocols/Updater.html @@ -411,7 +411,7 @@

Parameters

diff --git a/docs/Renderer.html b/docs/Renderer.html index aa7dcc0..69c522b 100644 --- a/docs/Renderer.html +++ b/docs/Renderer.html @@ -261,7 +261,7 @@

Declaration

diff --git a/docs/Section.html b/docs/Section.html index 40257ff..fc94fe3 100644 --- a/docs/Section.html +++ b/docs/Section.html @@ -238,7 +238,7 @@

Declaration

diff --git a/docs/Structs/AnyComponent.html b/docs/Structs/AnyComponent.html index 9961e15..2a697ba 100644 --- a/docs/Structs/AnyComponent.html +++ b/docs/Structs/AnyComponent.html @@ -670,7 +670,7 @@

Declaration

diff --git a/docs/Structs/CellNode.html b/docs/Structs/CellNode.html index 0c03619..fa5075b 100644 --- a/docs/Structs/CellNode.html +++ b/docs/Structs/CellNode.html @@ -484,7 +484,7 @@

Declaration

diff --git a/docs/Structs/Section.html b/docs/Structs/Section.html index 05fba93..916ad9b 100644 --- a/docs/Structs/Section.html +++ b/docs/Structs/Section.html @@ -685,7 +685,7 @@

Declaration

diff --git a/docs/Structs/ViewNode.html b/docs/Structs/ViewNode.html index 0638580..0c72824 100644 --- a/docs/Structs/ViewNode.html +++ b/docs/Structs/ViewNode.html @@ -369,7 +369,7 @@

Declaration

diff --git a/docs/Updaters.html b/docs/Updaters.html index 68f40d5..b76283f 100644 --- a/docs/Updaters.html +++ b/docs/Updaters.html @@ -364,7 +364,7 @@

Declaration

diff --git a/docs/index.html b/docs/index.html index c37ebae..5e316f5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -201,7 +201,7 @@

-Swift4.2 +Swift5 Release CocoaPods Carthage @@ -661,7 +661,7 @@

License

From 63987ce8edbc395117bd0cebedae9af661709013 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:31:57 +0900 Subject: [PATCH 12/13] Fix indentation --- Examples/Example-iOS/Sources/Form/FormViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Example-iOS/Sources/Form/FormViewController.swift b/Examples/Example-iOS/Sources/Form/FormViewController.swift index 1fb0f2c..6586a5b 100644 --- a/Examples/Example-iOS/Sources/Form/FormViewController.swift +++ b/Examples/Example-iOS/Sources/Form/FormViewController.swift @@ -48,7 +48,7 @@ final class FormViewController: UIViewController { title = "Profile Form" tableView.rowHeight = UITableView.automaticDimension tableView.estimatedRowHeight = UITableView.automaticDimension - NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillChangeFrame), name: UIResponder.keyboardWillChangeFrameNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillChangeFrame), name: UIResponder.keyboardWillChangeFrameNotification, object: nil) renderer.updater.deleteRowsAnimation = .middle renderer.updater.insertRowsAnimation = .middle From e958cc676b14eea081300ed24dbad35b99b85f41 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Thu, 28 Mar 2019 02:40:02 +0900 Subject: [PATCH 13/13] Fix travis ci settings --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d673c1..a3a8097 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ aliases: - ./scripts/install_swiftlint.sh script: - set -o pipefail - - xcodebuild build-for-testing test-without-building -workspace Carbon.xcworkspace -scheme Carbon -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X' ENABLE_TESTABILITY=YES | xcpretty - c + - xcodebuild build-for-testing test-without-building -workspace Carbon.xcworkspace -scheme Carbon -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X' ENABLE_TESTABILITY=YES | xcpretty - c matrix: include: @@ -17,4 +17,4 @@ matrix: osx_image: xcode10.2 notifications: - email: false \ No newline at end of file + email: false