Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

Commit

Permalink
Release 5.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryant Luk committed Sep 30, 2015
1 parent 3beb062 commit 9173709
Show file tree
Hide file tree
Showing 16 changed files with 85 additions and 14 deletions.
8 changes: 6 additions & 2 deletions CardIO.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'CardIO'
spec.version = '5.1.1'
spec.version = '5.2.0'
spec.license = { type: 'MIT', file: 'LICENSE.md' }
spec.homepage = 'https://www.card.io'
spec.authors = { 'CardIO' => '[email protected]' }
Expand All @@ -14,4 +14,8 @@ Pod::Spec.new do |spec|
spec.frameworks = 'AVFoundation', 'AudioToolbox', 'CoreMedia', 'CoreVideo', 'MobileCoreServices', 'OpenGLES', 'QuartzCore', 'Security', 'UIKit'
spec.libraries = 'c++'
spec.vendored_libraries = 'CardIO/libCardIO.a'
end
spec.prepare_command = <<-CMD
[ -f CardIO/libCardIO.a ] && rm CardIO/libCardIO.a
unzip -d CardIO/ CardIO/libCardIO.a.zip
CMD
end
2 changes: 1 addition & 1 deletion CardIO/CardIO.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIO.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
2 changes: 1 addition & 1 deletion CardIO/CardIOCreditCardInfo.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIOCreditCardInfo.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
2 changes: 1 addition & 1 deletion CardIO/CardIODetectionMode.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIODetectionMode.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
2 changes: 1 addition & 1 deletion CardIO/CardIOPaymentViewController.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIOPaymentViewController.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
2 changes: 1 addition & 1 deletion CardIO/CardIOPaymentViewControllerDelegate.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIOPaymentViewControllerDelegate.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
2 changes: 1 addition & 1 deletion CardIO/CardIOUtilities.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIOUtilities.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
2 changes: 1 addition & 1 deletion CardIO/CardIOView.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIOView.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
2 changes: 1 addition & 1 deletion CardIO/CardIOViewDelegate.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// CardIOViewDelegate.h
// Version 5.1.1
// Version 5.2.0
//
// See the file "LICENSE.md" for the full license governing this code.
//
Expand Down
Binary file removed CardIO/libCardIO.a
Binary file not shown.
Binary file added CardIO/libCardIO.a.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pod 'CardIO'
##### If you don't use CocoaPods, then:

1. Download the latest version of the SDK.
2. Add the CardIO directory (containing several .h files and libCardIO.a) to your Xcode project.
2. Add the CardIO directory (containing several .h files and libCardIO.a) to your Xcode project. You will need to unzip `libCardIO.a.zip` to get the `libCardIO.a`.
3. In your project's Build Settings (in the `TARGETS` section, not the `PROJECTS` section), add `-lc++` to `Other Linker Flags`.
4. *Either:*
* Add these frameworks to your project.
Expand Down
28 changes: 28 additions & 0 deletions SampleApp-Swift/SampleApp-Swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
isa = PBXNativeTarget;
buildConfigurationList = D534F1E01A324F64003C3AB4 /* Build configuration list for PBXNativeTarget "SampleApp-Swift" */;
buildPhases = (
A5DFB2B31BBC985E00AA810C /* Unzip libCardIO.a.zip */,
D534F1BD1A324F63003C3AB4 /* Sources */,
D534F1BE1A324F63003C3AB4 /* Frameworks */,
D534F1BF1A324F63003C3AB4 /* Resources */,
Expand Down Expand Up @@ -187,6 +188,8 @@
D534F1B91A324F63003C3AB4 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0610;
ORGANIZATIONNAME = "Punskyy, Roman";
TargetAttributes = {
Expand Down Expand Up @@ -238,6 +241,23 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
A5DFB2B31BBC985E00AA810C /* Unzip libCardIO.a.zip */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Unzip libCardIO.a.zip";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "[ -f ../CardIO/libCardIO.a ] && rm ../CardIO/libCardIO.a\nunzip -d ../CardIO/ ../CardIO/libCardIO.a.zip";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
D534F1BD1A324F63003C3AB4 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -379,6 +399,10 @@
"$(inherited)",
../CardIO,
);
OTHER_LDFLAGS = (
"-lc++",
"-ObjC",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
Expand All @@ -393,6 +417,10 @@
"$(inherited)",
../CardIO,
);
OTHER_LDFLAGS = (
"-lc++",
"-ObjC",
);
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion SampleApp-Swift/SampleApp-Swift/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ViewController: UIViewController, CardIOPaymentViewControllerDelegate {
}

@IBAction func scanCard(sender: AnyObject) {
var cardIOVC = CardIOPaymentViewController(paymentDelegate: self)
let cardIOVC = CardIOPaymentViewController(paymentDelegate: self)
cardIOVC.modalPresentationStyle = .FormSheet
presentViewController(cardIOVC, animated: true, completion: nil)
}
Expand Down
30 changes: 28 additions & 2 deletions SampleApp/ScanExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 0A2C90541564175A000727BC /* Build configuration list for PBXNativeTarget "ScanExample" */;
buildPhases = (
A5DFB2B41BBC994400AA810C /* Unzip libCardIO.a.zip */,
0A2C902F1564175A000727BC /* Sources */,
0A2C90301564175A000727BC /* Frameworks */,
0A2C90311564175A000727BC /* Resources */,
Expand Down Expand Up @@ -221,6 +222,23 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
A5DFB2B41BBC994400AA810C /* Unzip libCardIO.a.zip */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Unzip libCardIO.a.zip";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "[ -f ../CardIO/libCardIO.a ] && rm ../CardIO/libCardIO.a\nunzip -d ../CardIO/ ../CardIO/libCardIO.a.zip";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
0A2C902F1564175A000727BC /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -295,6 +313,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down Expand Up @@ -327,6 +346,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
Expand All @@ -344,7 +364,10 @@
"$(inherited)",
"$(SRCROOT)/../CardIO",
);
OTHER_LDFLAGS = "-lc++";
OTHER_LDFLAGS = (
"-lc++",
"-ObjC",
);
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand All @@ -361,7 +384,10 @@
"$(inherited)",
"$(SRCROOT)/../CardIO",
);
OTHER_LDFLAGS = "-lc++";
OTHER_LDFLAGS = (
"-lc++",
"-ObjC",
);
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand Down
13 changes: 13 additions & 0 deletions release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
card.io iOS SDK release notes
=============================

5.2.0 (Wed 9/30/2015)

* Enable Bitcode
(https://github.com/card-io/card.io-iOS-SDK/issues/119)
The library is now built with Xcode 7.0. It has Bitcode enabled which
does significantly increase the static library. However, when an app
is compiled and distributed by the App Store, the app size should not
significantly increase compared to before Bitcode enablement. You must also
use Xcode 7 since previous versions of Xcode are not fully compatible
with Bitcode enabled libraries.

--

5.1.1 (Wed 8/26/2015)

* Update CocoaPods podspec to use `vendored_libraries`.
Expand Down

0 comments on commit 9173709

Please sign in to comment.