Skip to content

Commit 9726410

Browse files
author
Bryant Luk
committed
Update Podspec, release notes, Samples
- Update Podspec with latest version - Add 'Accelerate' framework to sample apps - Add text for release notes
1 parent aff7e6d commit 9726410

File tree

4 files changed

+35
-7
lines changed

4 files changed

+35
-7
lines changed

‎Release/CardIO.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'CardIO'
3-
spec.version = '5.2.1'
3+
spec.version = '5.2.2'
44
spec.license = { type: 'MIT', file: 'LICENSE.md' }
55
spec.homepage = 'https://www.card.io'
66
spec.authors = { 'CardIO' => '[email protected]' }
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
1111
spec.ios.deployment_target = '6.1'
1212
spec.requires_arc = true
1313
spec.source_files = 'CardIO/*.h'
14-
spec.frameworks = 'Accelerate', ''AVFoundation', 'AudioToolbox', 'CoreMedia', 'CoreVideo', 'MobileCoreServices', 'OpenGLES', 'QuartzCore', 'Security', 'UIKit'
14+
spec.frameworks = 'Accelerate', 'AVFoundation', 'AudioToolbox', 'CoreMedia', 'CoreVideo', 'MobileCoreServices', 'OpenGLES', 'QuartzCore', 'Security', 'UIKit'
1515
spec.libraries = 'c++'
1616
spec.vendored_libraries = 'CardIO/libCardIO.a', 'CardIO/libopencv_core.a', 'CardIO/libopencv_imgproc.a'
1717
end

‎Release/SampleApp-Swift/SampleApp-Swift.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
A5DE69211BD5637B006F2C55 /* libopencv_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE691F1BD5637B006F2C55 /* libopencv_core.a */; settings = {ASSET_TAGS = (); }; };
11-
A5DE69221BD5637B006F2C55 /* libopencv_imgproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE69201BD5637B006F2C55 /* libopencv_imgproc.a */; settings = {ASSET_TAGS = (); }; };
10+
A5DE69211BD5637B006F2C55 /* libopencv_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE691F1BD5637B006F2C55 /* libopencv_core.a */; };
11+
A5DE69221BD5637B006F2C55 /* libopencv_imgproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE69201BD5637B006F2C55 /* libopencv_imgproc.a */; };
12+
A5E854D81BE929040098801B /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5E854D71BE929040098801B /* Accelerate.framework */; };
1213
D534F1C71A324F63003C3AB4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D534F1C61A324F63003C3AB4 /* AppDelegate.swift */; };
1314
D534F1C91A324F63003C3AB4 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D534F1C81A324F63003C3AB4 /* ViewController.swift */; };
1415
D534F1CC1A324F63003C3AB4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D534F1CA1A324F63003C3AB4 /* Main.storyboard */; };
@@ -31,6 +32,7 @@
3132
/* Begin PBXFileReference section */
3233
A5DE691F1BD5637B006F2C55 /* libopencv_core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopencv_core.a; sourceTree = "<group>"; };
3334
A5DE69201BD5637B006F2C55 /* libopencv_imgproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopencv_imgproc.a; sourceTree = "<group>"; };
35+
A5E854D71BE929040098801B /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
3436
D534F1C11A324F63003C3AB4 /* SampleApp-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SampleApp-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3537
D534F1C51A324F63003C3AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3638
D534F1C61A324F63003C3AB4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -61,6 +63,7 @@
6163
D534F1FA1A324F97003C3AB4 /* libCardIO.a in Frameworks */,
6264
A5DE69211BD5637B006F2C55 /* libopencv_core.a in Frameworks */,
6365
A5DE69221BD5637B006F2C55 /* libopencv_imgproc.a in Frameworks */,
66+
A5E854D81BE929040098801B /* Accelerate.framework in Frameworks */,
6467
);
6568
runOnlyForDeploymentPostprocessing = 0;
6669
};
@@ -146,6 +149,7 @@
146149
D534F1F91A324F97003C3AB4 /* libCardIO.a */,
147150
A5DE691F1BD5637B006F2C55 /* libopencv_core.a */,
148151
A5DE69201BD5637B006F2C55 /* libopencv_imgproc.a */,
152+
A5E854D71BE929040098801B /* Accelerate.framework */,
149153
);
150154
name = CardIO;
151155
path = ../CardIO;

‎Release/SampleApp/ScanExample.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
2680867016FFB2A00058FD24 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2680866F16FFB2A00058FD24 /* OpenGLES.framework */; };
2727
3EB7592518341EE80008860A /* libCardIO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EB7592318341EB80008860A /* libCardIO.a */; };
2828
3ED76B6417ECF9F50014F059 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ED76B6317ECF9F50014F059 /* CoreGraphics.framework */; };
29-
A5DE691D1BD562D3006F2C55 /* libopencv_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE691B1BD562D3006F2C55 /* libopencv_core.a */; settings = {ASSET_TAGS = (); }; };
30-
A5DE691E1BD562D3006F2C55 /* libopencv_imgproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE691C1BD562D3006F2C55 /* libopencv_imgproc.a */; settings = {ASSET_TAGS = (); }; };
29+
A5DE691D1BD562D3006F2C55 /* libopencv_core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE691B1BD562D3006F2C55 /* libopencv_core.a */; };
30+
A5DE691E1BD562D3006F2C55 /* libopencv_imgproc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A5DE691C1BD562D3006F2C55 /* libopencv_imgproc.a */; };
31+
A5E854D41BE9250B0098801B /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5E854D31BE9250B0098801B /* Accelerate.framework */; };
3132
/* End PBXBuildFile section */
3233

3334
/* Begin PBXFileReference section */
@@ -63,6 +64,7 @@
6364
3ED76B6317ECF9F50014F059 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
6465
A5DE691B1BD562D3006F2C55 /* libopencv_core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopencv_core.a; sourceTree = "<group>"; };
6566
A5DE691C1BD562D3006F2C55 /* libopencv_imgproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopencv_imgproc.a; sourceTree = "<group>"; };
67+
A5E854D31BE9250B0098801B /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
6668
/* End PBXFileReference section */
6769

6870
/* Begin PBXFrameworksBuildPhase section */
@@ -73,6 +75,7 @@
7375
3EB7592518341EE80008860A /* libCardIO.a in Frameworks */,
7476
A5DE691D1BD562D3006F2C55 /* libopencv_core.a in Frameworks */,
7577
A5DE691E1BD562D3006F2C55 /* libopencv_imgproc.a in Frameworks */,
78+
A5E854D41BE9250B0098801B /* Accelerate.framework in Frameworks */,
7679
0A96B63D156447AC00DBA017 /* AudioToolbox.framework in Frameworks */,
7780
0A96B63B156447A300DBA017 /* AVFoundation.framework in Frameworks */,
7881
3ED76B6417ECF9F50014F059 /* CoreGraphics.framework in Frameworks */,
@@ -111,6 +114,7 @@
111114
0A2C90361564175A000727BC /* Frameworks */ = {
112115
isa = PBXGroup;
113116
children = (
117+
A5E854D31BE9250B0098801B /* Accelerate.framework */,
114118
0A96B63C156447AC00DBA017 /* AudioToolbox.framework */,
115119
0A96B63A156447A300DBA017 /* AVFoundation.framework */,
116120
3ED76B6317ECF9F50014F059 /* CoreGraphics.framework */,

‎Release/release_notes.txt

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
11
card.io iOS SDK release notes
22
=============================
33

4-
5.2.1 (Mond 10/19/2015)
4+
5.2.2 (Tue 11/03/2015)
5+
6+
* You will need to link the `Accelerate` framework to your application.
7+
* Fix issue where an app would hang on card-scanning screen
8+
( https://github.com/card-io/card.io-iOS-SDK/issues/153 )
9+
If an app was displaying the card-scanning screen and was sent to the
10+
background, when the app was brought back to the foreground, the
11+
app would possibly hang on certain hardware, mainly iPhone 5S.
12+
* Add Carthage support
13+
( https://github.com/card-io/card.io-iOS-source/pull/36
14+
https://github.com/card-io/card.io-iOS-source/issues/32 )
15+
Initial support for Carthage. In a Cartfile, you can add
16+
`github "card-io/card.io-iOS-source"`
17+
to get Carthage to build a dynamic framework for inclusion in your
18+
projects.
19+
* Fix warning while running in simulator for 5.2.1
20+
( https://github.com/card-io/card.io-iOS-SDK/issues/154 )
21+
Add the x86_64 and i386 slices to the OpenCV libraries to prevent warnings.
22+
This was also necesary for clean builds for Carthage.
23+
24+
5.2.1 (Mon 10/19/2015)
525

626
* Split CardIO and OpenCV libraries
727
(https://github.com/card-io/card.io-iOS-SDK/issues/147

0 commit comments

Comments
 (0)