From a72fe4ea7a9443ae1a2a0f7a83e0a76cfd3bbf00 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 11:03:31 +0100 Subject: [PATCH 01/12] s.ios.deployment_target = '8.0' --- collection-view-layouts.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collection-view-layouts.podspec b/collection-view-layouts.podspec index 0046aa8..21b121a 100644 --- a/collection-view-layouts.podspec +++ b/collection-view-layouts.podspec @@ -17,7 +17,7 @@ Pod::Spec.new do |s| s.author = { 'sergey.afanasiev' => 'sergey.afanasiev@rubygarage.org' } s.source = { :git => 'https://github.com/rubygarage/collection-view-layouts.git', :tag => s.version.to_s } - s.ios.deployment_target = '11.0' + s.ios.deployment_target = '8.0' s.swift_versions = ['5.0'] s.subspec 'Core' do |core| From ec93a08f37798966e59d0c5e9a8b3767b43df19c Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 11:04:12 +0100 Subject: [PATCH 02/12] Create Gemfile --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..d2332a8 --- /dev/null +++ b/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +ruby "2.6.5" +gem "cocoapods", "~> 1.8.4" From 17306101c94126e2194bbd6ebae698bf38fecaa7 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 11:04:36 +0100 Subject: [PATCH 03/12] Create Gemfile.lock --- Gemfile.lock | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..7cab22c --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,86 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.1) + activesupport (4.2.11.1) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + algoliasearch (1.27.1) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) + atomos (0.1.3) + claide (1.0.3) + cocoapods (1.8.4) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.8.4) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.6.6) + nap (~> 1.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.11.1, < 2.0) + cocoapods-core (1.8.4) + activesupport (>= 4.0.2, < 6) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.2.2) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.4.1) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.1.5) + escape (0.0.4) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.2.0) + minitest (5.12.2) + molinillo (0.6.6) + nanaimo (0.2.6) + nap (1.1.0) + netrc (0.11.0) + ruby-macho (1.4.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + xcodeproj (1.13.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (~> 1.8.4) + +RUBY VERSION + ruby 2.6.5p114 + +BUNDLED WITH + 2.0.2 From ac97bdd627589b6f3140a1b410350a696a7599da Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 11:07:26 +0100 Subject: [PATCH 04/12] platform :ios, '8.0' --- Example/Podfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Example/Podfile b/Example/Podfile index ade22bd..acf5ca9 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,6 +1,8 @@ use_frameworks! target 'collection-view-layouts_Example' do + platform :ios, '8.0' + pod 'collection-view-layouts/Core', :path => '../' pod 'collection-view-layouts/TagsLayout', :path => '../' pod 'collection-view-layouts/PinterestLayout', :path => '../' From 32e3d37b2a8810698d0f73ef1e7bdfa8570a87b1 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 11:07:47 +0100 Subject: [PATCH 05/12] Update Podfile.lock --- Example/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 1634602..cfef170 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -30,7 +30,7 @@ DEPENDENCIES: - Quick (= 2.1.0) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://cdn.cocoapods.org/: - Nimble - Quick @@ -39,10 +39,10 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - collection-view-layouts: bed793b792c8394d0a0b69a1b02e7a775c0bceeb + collection-view-layouts: 023a660cdf4e1340980b568256ae085014166eaa Nimble: 622629381bda1dd5678162f21f1368cec7cbba60 Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d -PODFILE CHECKSUM: 7eed666504635eb064559cfed86f85daa7df14cb +PODFILE CHECKSUM: be8f7d6538478fc6ec254c5852fa5ff5a3bb6b8a -COCOAPODS: 1.7.2 +COCOAPODS: 1.8.4 From 476293fdde200a503d922f385fbafcb081965128 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 11:08:11 +0100 Subject: [PATCH 06/12] Update project.pbxproj --- Example/collection-view-layouts.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Example/collection-view-layouts.xcodeproj/project.pbxproj b/Example/collection-view-layouts.xcodeproj/project.pbxproj index 46670f6..81ec042 100644 --- a/Example/collection-view-layouts.xcodeproj/project.pbxproj +++ b/Example/collection-view-layouts.xcodeproj/project.pbxproj @@ -612,7 +612,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -661,7 +661,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; From 96a62ccc86fcbbf576fc482b157ce3ce28255528 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 13:09:41 +0100 Subject: [PATCH 07/12] Trying rvm: 2.6.5 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34ff048..f7e067c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: swift osx_image: xcode11 +rvm: 2.6.5 cache: cocoapods podfile: Example/Podfile @@ -11,4 +12,4 @@ script: - set -o pipefail && xcodebuild -workspace Example/collection-view-layouts.xcworkspace -scheme collection-view-layouts-Example -configuration 'Debug' -sdk 'iphonesimulator13.0' -destination 'platform=iOS Simulator,OS=12.1,name=iPhone 8' test | xcpretty -f `xcpretty-travis-formatter` after_success: - - bash <(curl -s https://codecov.io/bash) \ No newline at end of file + - bash <(curl -s https://codecov.io/bash) From b108a4f23c8721e0896c2333b9b0676a050c4809 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 13:14:58 +0100 Subject: [PATCH 08/12] bundle update --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7e067c..bd18859 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ language: swift osx_image: xcode11 -rvm: 2.6.5 cache: cocoapods podfile: Example/Podfile before_install: -- pod install --project-directory=Example +- bundle update +- bundle exec pod install --project-directory=Example script: - set -o pipefail && xcodebuild -workspace Example/collection-view-layouts.xcworkspace -scheme collection-view-layouts-Example -configuration 'Debug' -sdk 'iphonesimulator13.0' -destination 'platform=iOS Simulator,OS=12.1,name=iPhone 8' test | xcpretty -f `xcpretty-travis-formatter` From cfd0f625a5cc5a5733dec1c06e86838e7af4dca3 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 13:20:39 +0100 Subject: [PATCH 09/12] bundle install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd18859..d612149 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: cocoapods podfile: Example/Podfile before_install: -- bundle update +- bundle install - bundle exec pod install --project-directory=Example script: From 24837236bbba010a7e0fced0c094f2a57a93ab60 Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 13:20:58 +0100 Subject: [PATCH 10/12] ruby "2.6.4" --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d2332a8..1681675 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source "https://rubygems.org" -ruby "2.6.5" +ruby "2.6.4" gem "cocoapods", "~> 1.8.4" From 92730931d04af3a22da1bc7e53d389a53643700d Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 13:26:12 +0100 Subject: [PATCH 11/12] xcode11.1 + iOS 13.1 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d612149..bdbdb37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: swift -osx_image: xcode11 +osx_image: xcode11.1 cache: cocoapods podfile: Example/Podfile @@ -9,7 +9,7 @@ before_install: - bundle exec pod install --project-directory=Example script: -- set -o pipefail && xcodebuild -workspace Example/collection-view-layouts.xcworkspace -scheme collection-view-layouts-Example -configuration 'Debug' -sdk 'iphonesimulator13.0' -destination 'platform=iOS Simulator,OS=12.1,name=iPhone 8' test | xcpretty -f `xcpretty-travis-formatter` +- set -o pipefail && xcodebuild -workspace Example/collection-view-layouts.xcworkspace -scheme collection-view-layouts-Example -configuration 'Debug' -sdk 'iphonesimulator13.1' -destination 'platform=iOS Simulator,OS=13.1,name=iPhone 8' test | xcpretty -f `xcpretty-travis-formatter` after_success: - bash <(curl -s https://codecov.io/bash) From dabc153732f1cec070c2a074428049434abac13f Mon Sep 17 00:00:00 2001 From: Roman Podymov Date: Mon, 28 Oct 2019 22:06:57 +0100 Subject: [PATCH 12/12] Update Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7cab22c..960afeb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ DEPENDENCIES cocoapods (~> 1.8.4) RUBY VERSION - ruby 2.6.5p114 + ruby 2.6.4p104 BUNDLED WITH 2.0.2