From 69ee1398106fabe942424fcd3063fc8f2101919d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Ka=C5=A1par=20Jir=C3=A1sek?= Date: Sun, 25 Aug 2019 09:28:35 +0200 Subject: [PATCH 1/4] Add dependency on main repo --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b957796..69b86e0 100644 --- a/Package.swift +++ b/Package.swift @@ -14,7 +14,7 @@ let package = Package( targets: ["DiffableCellKit"]) ], dependencies: [ - .package(url: "https://github.com/DenTelezhkin/Dwifft", .branch("swift-pm")) + .package(url: "https://github.com/jflinter/Dwifft", .revision("6fec2bc0246091b3e17a9d42e722fb98e05ac3ff")) ], targets: [ .target( From f71535a94067aa88daae6f5649a9cd0de6a805b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Ka=C5=A1par=20Jir=C3=A1sek?= Date: Sun, 25 Aug 2019 09:28:48 +0200 Subject: [PATCH 2/4] Increment version to 0.5.1 --- CellKit.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CellKit.podspec b/CellKit.podspec index 047bcf0..bd4adda 100644 --- a/CellKit.podspec +++ b/CellKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "CellKit" - s.version = "0.5.0" + s.version = "0.5.1" s.summary = "Table View and Collection View data source wrapper" s.description = <<-DESC Generic abstraction over table/collection data source From d1d924a6a44b46682436d5dd09305561986941fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Ka=C5=A1par=20Jir=C3=A1sek?= Date: Sun, 25 Aug 2019 09:32:45 +0200 Subject: [PATCH 3/4] Update bundle --- Gemfile.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ee96d95..b14e269 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) + CFPropertyList (3.0.1) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) @@ -11,11 +11,11 @@ GEM public_suffix (>= 2.0.2, < 4.0) atomos (0.1.3) babosa (1.0.2) - claide (1.0.2) - cocoapods (1.7.4) + claide (1.0.3) + cocoapods (1.7.5) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.4) + cocoapods-core (= 1.7.5) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,7 +31,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.4) + cocoapods-core (1.7.5) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -41,7 +41,7 @@ GEM nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.3.1) + cocoapods-trunk (1.4.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) @@ -55,10 +55,10 @@ GEM digest-crc (0.4.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.4) + dotenv (2.7.5) emoji_regex (1.0.1) escape (0.0.4) - excon (0.64.0) + excon (0.66.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -67,7 +67,7 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) fastimage (2.1.5) - fastlane (2.127.1) + fastlane (2.129.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -87,7 +87,7 @@ GEM highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) jwt (~> 2.1.0) - mini_magick (~> 4.5.1) + mini_magick (>= 4.9.4, < 5.0.0) multi_xml (~> 0.5) multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) @@ -116,9 +116,9 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.9) - google-cloud-core (1.3.0) + google-cloud-core (1.3.1) google-cloud-env (~> 1.0) - google-cloud-env (1.2.0) + google-cloud-env (1.2.1) faraday (~> 0.11) google-cloud-storage (1.16.0) digest-crc (~> 0.4) @@ -144,7 +144,7 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) - mini_magick (4.5.1) + mini_magick (4.9.5) minitest (5.11.3) molinillo (0.6.6) multi_json (1.13.1) @@ -191,7 +191,7 @@ GEM unf_ext (0.0.7.6) unicode-display_width (1.6.0) word_wrap (1.0.0) - xcodeproj (1.11.0) + xcodeproj (1.12.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) From c4cdee343841a151fceb9872c29a6f53f1203884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Ka=C5=A1par=20Jir=C3=A1sek?= Date: Mon, 26 Aug 2019 08:16:59 +0200 Subject: [PATCH 4/4] Update example project in new Xcode beta 6 --- Example/Example.xcodeproj/project.pbxproj | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index f172d13..b475010 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -7,8 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - E79CE44322E1F57A00017B98 /* CellKit in Frameworks */ = {isa = PBXBuildFile; productRef = E79CE44222E1F57A00017B98 /* CellKit */; }; - E79CE44522E1F57A00017B98 /* DiffableCellKit in Frameworks */ = {isa = PBXBuildFile; productRef = E79CE44422E1F57A00017B98 /* DiffableCellKit */; }; + E72976192313B07A008B6E2F /* CellKit in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E72976182313B04B008B6E2F /* CellKit */; }; + E729761B2313B089008B6E2F /* CellKit in Frameworks */ = {isa = PBXBuildFile; productRef = E729761A2313B089008B6E2F /* CellKit */; }; + E729761D2313B089008B6E2F /* DiffableCellKit in Frameworks */ = {isa = PBXBuildFile; productRef = E729761C2313B089008B6E2F /* DiffableCellKit */; }; E7BB267522D4B63800A7713E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7BB266322D4B63800A7713E /* ViewController.swift */; }; E7BB267622D4B63800A7713E /* DeviceAndroidCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7BB266522D4B63800A7713E /* DeviceAndroidCell.swift */; }; E7BB267722D4B63800A7713E /* NibTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E7BB266622D4B63800A7713E /* NibTableViewCell.xib */; }; @@ -43,6 +44,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + E72976192313B07A008B6E2F /* CellKit in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -51,7 +53,7 @@ /* Begin PBXFileReference section */ D02135A420CA609D00EE79D1 /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E79CE44122E1F56600017B98 /* CellKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = CellKit; path = ../..; sourceTree = ""; }; + E72976182313B04B008B6E2F /* CellKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = CellKit; path = ../..; sourceTree = ""; }; E7BB266322D4B63800A7713E /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; E7BB266522D4B63800A7713E /* DeviceAndroidCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceAndroidCell.swift; sourceTree = ""; }; E7BB266622D4B63800A7713E /* NibTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NibTableViewCell.xib; sourceTree = ""; }; @@ -77,8 +79,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E79CE44522E1F57A00017B98 /* DiffableCellKit in Frameworks */, - E79CE44322E1F57A00017B98 /* CellKit in Frameworks */, + E729761D2313B089008B6E2F /* DiffableCellKit in Frameworks */, + E729761B2313B089008B6E2F /* CellKit in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -114,7 +116,7 @@ E7BB266222D4B63800A7713E /* Sources */ = { isa = PBXGroup; children = ( - E79CE44122E1F56600017B98 /* CellKit */, + E72976182313B04B008B6E2F /* CellKit */, E7BB266322D4B63800A7713E /* ViewController.swift */, E7BB266422D4B63800A7713E /* Cells */, E7BB266B22D4B63800A7713E /* LaunchScreen.storyboard */, @@ -192,8 +194,8 @@ ); name = Example; packageProductDependencies = ( - E79CE44222E1F57A00017B98 /* CellKit */, - E79CE44422E1F57A00017B98 /* DiffableCellKit */, + E729761A2313B089008B6E2F /* CellKit */, + E729761C2313B089008B6E2F /* DiffableCellKit */, ); productName = Example; productReference = D02135A420CA609D00EE79D1 /* Example.app */; @@ -601,11 +603,11 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - E79CE44222E1F57A00017B98 /* CellKit */ = { + E729761A2313B089008B6E2F /* CellKit */ = { isa = XCSwiftPackageProductDependency; productName = CellKit; }; - E79CE44422E1F57A00017B98 /* DiffableCellKit */ = { + E729761C2313B089008B6E2F /* DiffableCellKit */ = { isa = XCSwiftPackageProductDependency; productName = DiffableCellKit; };