Merge branch 'hotfix/0.3.0'

bcylin · Dec 3, 2015 · 0cba539 · 0cba539
2 parents eca3837 + d34b9a7
commit 0cba539
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
-## v0.2.1
+## v0.3.0
 
 #### Breaking
 
 * Header files other than `NEUPagingSegmentedControl` are now private
 
+#### Fixed
+
+* The tag `v0.2.1` is dropped since it is not compatible with `v0.2.0`
+
 ## v0.2.0
 
 #### Added

diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.1</string>
+	<string>0.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/NEUPagingSegmentedControl.podspec b/NEUPagingSegmentedControl.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "NEUPagingSegmentedControl"
-  s.version       = "0.2.1"
+  s.version       = "0.3.0"
   s.summary       = "A horizontal segmented control that works with UIScrollView paging."
   s.screenshots   = "https://bcylin.github.io/NEUPagingSegmentedControl/img/screenshot.png"
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - NEUPagingSegmentedControl (0.2.1)
+  - NEUPagingSegmentedControl (0.3.0)
 
 DEPENDENCIES:
   - NEUPagingSegmentedControl (from `./`)
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  NEUPagingSegmentedControl: aaab0d6c490275434dfb04ba0ffeef55c8603bd9
+  NEUPagingSegmentedControl: 1efe526fbf4c69210424043cf3922f72b87557c0
 
 COCOAPODS: 0.39.0
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ pod 'NEUPagingSegmentedControl', git: 'https://github.com/bcylin/NEUPagingSegmen
 * Create a `Cartfile` with the following specification and run `carthage bootstrap`.
 
 ```
-github "bcylin/NEUPagingSegmentedControl"
+github "bcylin/NEUPagingSegmentedControl" >= 0.3.0
 ```
 
 * Follow the [instructions](https://github.com/Carthage/Carthage#if-youre-building-for-ios) to add the framework to an iOS project.

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