diff --git a/CardIO.podspec b/CardIO.podspec index 975f1d3..7a30892 100644 --- a/CardIO.podspec +++ b/CardIO.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'CardIO' - spec.version = '4.0.0' + spec.version = '4.0.1' spec.license = { type: 'MIT', file: 'LICENSE.md' } spec.homepage = 'https://www.card.io' spec.authors = { 'CardIO' => 'support@paypal.com' } diff --git a/CardIO/CardIO.h b/CardIO/CardIO.h index f62ac87..5be846d 100644 --- a/CardIO/CardIO.h +++ b/CardIO/CardIO.h @@ -1,12 +1,13 @@ // // CardIO.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // // All-in-one header file for card.io sdk. #import "CardIOCreditCardInfo.h" +#import "CardIODetectionMode.h" #import "CardIOView.h" #import "CardIOViewDelegate.h" #import "CardIOPaymentViewController.h" diff --git a/CardIO/CardIOCreditCardInfo.h b/CardIO/CardIOCreditCardInfo.h index 70c0a31..5701399 100644 --- a/CardIO/CardIOCreditCardInfo.h +++ b/CardIO/CardIOCreditCardInfo.h @@ -1,6 +1,6 @@ // // CardIOCreditCardInfo.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // diff --git a/CardIO/CardIODetectionMode.h b/CardIO/CardIODetectionMode.h index cf80939..93f74a7 100644 --- a/CardIO/CardIODetectionMode.h +++ b/CardIO/CardIODetectionMode.h @@ -1,6 +1,6 @@ // // CardIODetectionMode.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // diff --git a/CardIO/CardIOPaymentViewController.h b/CardIO/CardIOPaymentViewController.h index 7b162a0..9505b53 100644 --- a/CardIO/CardIOPaymentViewController.h +++ b/CardIO/CardIOPaymentViewController.h @@ -1,6 +1,6 @@ // // CardIOPaymentViewController.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // @@ -39,7 +39,7 @@ /// E.g., specifying "en" on a device set to "English" and "United Kingdom" will result in "en_GB". /// /// These localizations are currently included: -/// ar,da,de,en,en_AU,en_GB,en_SE,es,es_MX,fr,he,it,ja,ko,ms,nb,nl,pl,pt,pt_BR,ru,sv,th,tr,zh-Hans,zh-Hant,zh-Hant_TW. +/// ar,da,de,en,en_AU,en_GB,en_SE,es,es_MX,fr,he,is,it,ja,ko,ms,nb,nl,pl,pt,pt_BR,ru,sv,th,tr,zh-Hans,zh-Hant,zh-Hant_TW. @property(nonatomic, copy, readwrite) NSString *languageOrLocale; /// If YES, the status bar's style will be kept as whatever your app has set it to. diff --git a/CardIO/CardIOPaymentViewControllerDelegate.h b/CardIO/CardIOPaymentViewControllerDelegate.h index ec4dbd5..4760081 100644 --- a/CardIO/CardIOPaymentViewControllerDelegate.h +++ b/CardIO/CardIOPaymentViewControllerDelegate.h @@ -1,6 +1,6 @@ // // CardIOPaymentViewControllerDelegate.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // diff --git a/CardIO/CardIOUtilities.h b/CardIO/CardIOUtilities.h index 0212862..dab1ae2 100644 --- a/CardIO/CardIOUtilities.h +++ b/CardIO/CardIOUtilities.h @@ -1,6 +1,6 @@ // // CardIOUtilities.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // diff --git a/CardIO/CardIOView.h b/CardIO/CardIOView.h index 598171f..5e0941b 100644 --- a/CardIO/CardIOView.h +++ b/CardIO/CardIOView.h @@ -1,6 +1,6 @@ // // CardIOView.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // @@ -34,7 +34,7 @@ /// E.g., specifying "en" on a device set to "English" and "United Kingdom" will result in "en_GB". /// /// These localizations are currently included: -/// ar,da,de,en,en_AU,en_GB,en_SE,es,es_MX,fr,he,it,ja,ko,ms,nb,nl,pl,pt,pt_BR,ru,sv,th,tr,zh-Hans,zh-Hant,zh-Hant_TW. +/// ar,da,de,en,en_AU,en_GB,en_SE,es,es_MX,fr,he,is,it,ja,ko,ms,nb,nl,pl,pt,pt_BR,ru,sv,th,tr,zh-Hans,zh-Hant,zh-Hant_TW. @property(nonatomic, copy, readwrite) NSString *languageOrLocale; /// Alter the card guide (bracket) color. Opaque colors recommended. diff --git a/CardIO/CardIOViewDelegate.h b/CardIO/CardIOViewDelegate.h index 1b3d333..c8e7b0a 100644 --- a/CardIO/CardIOViewDelegate.h +++ b/CardIO/CardIOViewDelegate.h @@ -1,6 +1,6 @@ // // CardIOViewDelegate.h -// Version 4.0.0 +// Version 4.0.1 // // See the file "LICENSE.md" for the full license governing this code. // diff --git a/CardIO/libCardIO.a b/CardIO/libCardIO.a index fe04d7d..7b8d8f4 100644 Binary files a/CardIO/libCardIO.a and b/CardIO/libCardIO.a differ diff --git a/acknowledgments.md b/acknowledgments.md index 3dc9f3b..13ca950 100644 --- a/acknowledgments.md +++ b/acknowledgments.md @@ -7,12 +7,9 @@ card.io's iOS SDK uses code from the following libraries (with gratitude!): * [Eigen](http://eigen.tuxfamily.org) * Erica Sadun's [iPhone Developer's Cookbook Code Samples and uidevice-extension categories](https://github.com/erica/) * Georg Kitz's [UIDevice-with-UniqueIdentifier-for-iOS-5](https://github.com/gekitz/UIDevice-with-UniqueIdentifier-for-iOS-5) - * Base64 [en|de]coding methods by Dave Winer, via Colloquy's [Chat Core](http://colloquy.info/project/wiki/Source%20Code) * Tomáš Znamenáček's [Lambda Alert](https://github.com/zoul/Lambda-Alert) * Josh Bleecher Snyder's [TLCommon](https://github.com/treelinelabs/TLCommon) - * Facebook's [Three20](https://github.com/facebook/three20) * [Openstack](http://openstack.org/) - * [Mersenne Twister](http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html) Full licenses ------------- @@ -52,10 +49,6 @@ George Kitz's UIDevice-with-UniqueIdentifier-for-iOS-5, MIT license: OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Colloquy's Chat Core, BSD license: - - Actual license text not provided -- [the Colloquy website](http://colloquy.info/project/wiki/Source%20Code) says "Chat Core is licensed under the BSD license terms". For generic BSD license text, see http://opensource.org/licenses/bsd-license.php - Willow Garage's OpenCV, BSD license: Actual license text not provided -- [the OpenCV website](http://opencv.willowgarage.com/wiki/) says "OpenCV is released under a BSD license, it is free for both academic and commercial use.", with links to http://opensource.org/licenses/bsd-license.php and http://en.wikipedia.org/wiki/BSD_licenses @@ -107,55 +100,6 @@ Tomáš Znamenáček's Lambda Alert, MIT license: out of or in connection with the Software or the use or other dealings in the Software. -Facebook's Three20, Apache 2.0 license: - - Copyright 2009-2011 Facebook - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - Openstack, Apache 2.0 license: Actual license text not provided -- [the Openstack website](http://openstack.org/) says "The OpenStack project is provided under the Apache 2.0 license."; the Apache 2.0 license text can be found at http://www.apache.org/licenses/LICENSE-2.0.txt - -Makoto Matsumoto and Takuji Nishimura's [Mersenne Twister](http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html) - - Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. The names of its contributors may not be used to endorse or promote - products derived from this software without specific prior written - permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - \ No newline at end of file diff --git a/release_notes.txt b/release_notes.txt index b711213..1f10455 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,6 +1,12 @@ card.io iOS SDK release notes ============================= +4.0.1 (Mon 1/5/2015) + +* Fix a potential rare crash. (see https://github.com/paypal/PayPal-iOS-SDK/issues/220 for a similar case) + +-- + 4.0.0 (Mon 12/1/2014) * Build from the new open-source edition of card.io: https://github.com/card-io/card.io-iOS-source