Merge branch 'release/1.1.1'

MattLewin · Oct 10, 2018 · 98740ec · 98740ec
2 parents 57de625 + 169613e
commit 98740ec
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,4 +12,4 @@ cache:
 before_install:
  - gem install xcpretty --no-document
 script:
- - set -o pipefail && travis_retry xcodebuild test -project NumericPicker.xcodeproj -scheme NumericPicker -destination 'platform=iOS Simulator,name=iPhone X,OS=12.0' ONLY_ACTIVE_ARCH=NO | xcpretty
+ - set -o pipefail && travis_retry xcodebuild test -project NumericPicker.xcodeproj -scheme NumericPicker -destination 'platform=iOS Simulator,name=iPhone X,OS=11.4' ONLY_ACTIVE_ARCH=NO | xcpretty
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # 1.1.1
-* Remove the obsolete (and build-breaking) versioning artifact forcing this cocoapod to build as Swift 4.0 
+* Reduce minimum required iOS version to 10.3. (Xcode 10 and Swift 4.2 still required)
 
 # 1.1.0
 * Update minimum requirements to be Xcode 10, iOS 12, and Swift 4.2
+* Remove the obsolete (and build-breaking) versioning artifact forcing this cocoapod to build as Swift 4.0 
 
-# 1.0.1
+# 1.0.1 - Long-Term Xcode 9 & Swift 4.0 support
 * Fix [issue #4](https://github.com/MattLewin/NumericPicker/issues/4): work around an iOS 12 SDK bug with picker view heights
 * Make NumericPicker example respond to changes in dynamic fonts
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 MoGroups <[email protected]>
+Copyright (c) 2017-2018 MoGroups <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/NumericPicker.podspec b/NumericPicker.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NumericPicker'
-  s.version          = '1.1.0'
+  s.version          = '1.1.1'
   s.summary          = 'iOS picker for easily selecting numbers by digit.'
   s.swift_version    = '4.2'
 
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.source           = { :git => 'https://github.com/MattLewin/NumericPicker.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/mlewin72'
 
-  s.ios.deployment_target = '12'
+  s.ios.deployment_target = '10.3'
 
   s.source_files = 'Sources'
   s.frameworks = 'UIKit'

diff --git a/NumericPicker.xcodeproj/project.pbxproj b/NumericPicker.xcodeproj/project.pbxproj
@@ -407,12 +407,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -463,11 +464,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -497,7 +499,6 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -524,7 +525,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -544,7 +544,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mogroups.NumericPickerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -564,7 +563,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mogroups.NumericPickerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -583,7 +581,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mogroups.NumericPicker-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -602,7 +599,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mogroups.NumericPicker-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/README.md b/README.md
@@ -39,11 +39,11 @@ current (or specified) locale. You can easily dictate the number of integer and
 ## Minimum Requirements
 ### Version 1.1.x
 * Xcode 10
-* iOS 12
+* iOS 10.3
 * Swift 4.2
 
 ### Version 1.0.x
-* Xcode 9.0
+* Xcode 9
 * iOS 10.3
 
 ## Example
@@ -68,7 +68,7 @@ First, add the following line to your [Podfile](http://guides.cocoapods.org/usin
 pod "NumericPicker"
 ```
 
-or, for iOS versions 10.3 - 11.4
+or, for Xcode 9 and Swift 4.0
 
 ```ruby
 pod "NumericPicker", '~> 1.0.0'
@@ -91,7 +91,7 @@ To integrate `NumericPicker` into your Xcode project using Carthage, specify it
 github "MattLewin/NumericPicker"
 ```
 
-or, for iOS versions 10.3 - 11.4
+or, for Xcode 9 and Swift 4.0
 
 ```ruby
 github "MattLewin/NumericPicker" ~> 1.0.0