Preparing for the 4.0.1 release;

Antondomashnev · May 19, 2017 · 0f30d61 · 0f30d61
1 parent ee79369
commit 0f30d61
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode8.3
 xcode_workspace: ADMozaikCollectionViewLayout.xcworkspace
 xcode_scheme: ADMozaikCollectionViewLayout
 xcode_sdk: iphonesimulator10.3

diff --git a/ADMozaicCollectionViewLayout.podspec b/ADMozaicCollectionViewLayout.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = 'ADMozaicCollectionViewLayout'
-  s.version      = '4.0.0'
+  s.version      = '4.0.1'
   s.summary      = "Custom mozaic style collection view layout"
 
   s.description  = <<-DESC

diff --git a/ADMozaikCollectionViewLayout.xcodeproj/project.pbxproj b/ADMozaikCollectionViewLayout.xcodeproj/project.pbxproj
@@ -392,7 +392,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		88E79A6DCE69D60D0BFD5B86 /* [CP] Check Pods Manifest.lock */ = {
@@ -407,7 +407,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		C8F0184B852EE0FDDCDA062B /* [CP] Copy Pods Resources */ = {

diff --git a/ADMozaikCollectionViewLayout/Info.plist b/ADMozaikCollectionViewLayout/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>4.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/CHANGELOG.yml b/CHANGELOG.yml
@@ -1,9 +1,11 @@
 ---
 upcoming:
-  version: 4.0.1
+  version:
   notes:
-  - Swift 3.1 updates
 releases:
+- version: 4.0.1
+  notes:
+  - Swift 3.1 updates
 - version: 4.0.0
   notes:
   - Add supplementary view support [#21](https://github.com/Antondomashnev/ADMozaicCollectionViewLayout/issues/21)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,33 +2,32 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.7.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     claide (1.0.1)
-    cocoapods (1.2.0)
+    cocoapods (1.2.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.2.0)
+      cocoapods-core (= 1.2.1)
       cocoapods-deintegrate (>= 1.0.1, < 2.0)
       cocoapods-downloader (>= 1.1.3, < 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.1.2, < 2.0)
+      cocoapods-trunk (>= 1.2.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.5)
+      molinillo (~> 0.5.7)
       nap (~> 1.0)
-      ruby-macho (~> 0.2.5)
-      xcodeproj (>= 1.4.1, < 2.0)
-    cocoapods-core (1.2.0)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.4.4, < 2.0)
+    cocoapods-core (1.2.1)
       activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -38,35 +37,33 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.2)
+    cocoapods-trunk (1.2.0)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
-    colored (1.2)
+    colored2 (3.1.2)
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.0.3)
-    i18n (0.8.0)
-    json (1.8.6)
-    minitest (5.10.1)
-    molinillo (0.5.6)
+    i18n (0.8.1)
+    minitest (5.10.2)
+    molinillo (0.5.7)
     nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
-    rouge (1.11.1)
-    ruby-macho (0.2.6)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    rouge (2.0.7)
+    ruby-macho (1.1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    xcodeproj (1.4.2)
+    xcodeproj (1.4.4)
       CFPropertyList (~> 2.3.3)
-      activesupport (>= 3)
       claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
-    xcpretty (0.2.4)
-      rouge (~> 1.8)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
 
 PLATFORMS
   ruby

diff --git a/Podfile.lock b/Podfile.lock
@@ -5,8 +5,8 @@ PODS:
   - FBSnapshotTestCase/Core (2.1.4)
   - FBSnapshotTestCase/SwiftSupport (2.1.4):
     - FBSnapshotTestCase/Core
-  - Nimble (6.0.1)
-  - Sourcery (0.5.9)
+  - Nimble (7.0.0)
+  - Sourcery (0.6.0)
 
 DEPENDENCIES:
   - FBSnapshotsViewerRunPhaseScript (~> 0.1)
@@ -24,18 +24,18 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   FBSnapshotTestCase:
-    :commit: c1808fb4435ffc3db2203e7623935f39fc31aa8f
+    :commit: d9ec82be11d473576258f107489f7013ee321771
     :git: https://github.com/facebook/ios-snapshot-test-case.git
   Nimble:
-    :commit: 16a9a31918596b03ad88e6ec9a5cd7f90f0e4d93
+    :commit: 40e892ccd43d82b5eed1b9944822945fb5c4965f
     :git: https://github.com/Quick/Nimble.git
 
 SPEC CHECKSUMS:
   FBSnapshotsViewerRunPhaseScript: 9f91d09b6373896903e6eefc23232f16a03418e5
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  Nimble: 1aafe036e5b03c5a30d07430fddca564af570696
-  Sourcery: 45e4b8ab587861e67de267957b16d91902f3a26f
+  Nimble: 67063ced9dad28bd882c7faa39f46a1409cf7296
+  Sourcery: b3a93fcdf9c256feeb16e85f4d1bbf46baa42464
 
 PODFILE CHECKSUM: 6511e20895d718a8abe2ae5c56e13aa071e6fb48
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.2.1