Skip to content

Commit 02b5ec9

Browse files
author
Chad Cummings
committed
Set Target iOS 9.0.
Enhance Example project to include buttons for push navigation and presenting the scanner.
1 parent f2e4fa3 commit 02b5ec9

15 files changed

Lines changed: 178 additions & 53 deletions

File tree

‎BarcodeScanner.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
}
1212
s.social_media_url = 'https://twitter.com/hyperoslo'
1313

14-
s.platform = :ios, '9.3'
14+
s.platform = :ios, '9.0'
1515
s.requires_arc = true
1616

1717
s.source_files = 'Sources/**/*'

‎BarcodeScanner.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
235235
GCC_WARN_UNUSED_FUNCTION = YES;
236236
GCC_WARN_UNUSED_VARIABLE = YES;
237-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
237+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
238238
MTL_ENABLE_DEBUG_INFO = YES;
239239
ONLY_ACTIVE_ARCH = YES;
240240
SDKROOT = iphoneos;
@@ -284,7 +284,7 @@
284284
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
285285
GCC_WARN_UNUSED_FUNCTION = YES;
286286
GCC_WARN_UNUSED_VARIABLE = YES;
287-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
287+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
288288
MTL_ENABLE_DEBUG_INFO = NO;
289289
SDKROOT = iphoneos;
290290
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -306,7 +306,7 @@
306306
DYLIB_INSTALL_NAME_BASE = "@rpath";
307307
INFOPLIST_FILE = "$(SRCROOT)/BarcodeScanner/Info-iOS.plist";
308308
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
309-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
309+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
310310
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
311311
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.BarcodeScanner-iOS";
312312
PRODUCT_NAME = BarcodeScanner;
@@ -327,7 +327,7 @@
327327
DYLIB_INSTALL_NAME_BASE = "@rpath";
328328
INFOPLIST_FILE = "$(SRCROOT)/BarcodeScanner/Info-iOS.plist";
329329
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
330-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
330+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
331331
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
332332
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.BarcodeScanner-iOS";
333333
PRODUCT_NAME = BarcodeScanner;

‎Example/BarcodeScannerExample/BarcodeScannerExample.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10+
63C957FE1F74872600BAD365 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63C957FC1F74872600BAD365 /* Main.storyboard */; };
1011
7D6D7D252B4099761F98D03B /* Pods_BarcodeScannerExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2F8EDB06143E719746E253D /* Pods_BarcodeScannerExample.framework */; };
1112
D50BE3F91C9FE8870000A34C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D50BE3F81C9FE8870000A34C /* AppDelegate.swift */; };
1213
D50BE3FB1C9FE8870000A34C /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D50BE3FA1C9FE8870000A34C /* ViewController.swift */; };
@@ -16,6 +17,7 @@
1617

1718
/* Begin PBXFileReference section */
1819
560D7A8F00215E8F16A67009 /* Pods-BarcodeScannerExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BarcodeScannerExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BarcodeScannerExample/Pods-BarcodeScannerExample.debug.xcconfig"; sourceTree = "<group>"; };
20+
63C957FD1F74872600BAD365 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
1921
B2BB8B30EF0245DC64F4025A /* Pods-BarcodeScannerExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BarcodeScannerExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-BarcodeScannerExample/Pods-BarcodeScannerExample.release.xcconfig"; sourceTree = "<group>"; };
2022
D50BE3F51C9FE8870000A34C /* BarcodeScannerExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BarcodeScannerExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
2123
D50BE3F81C9FE8870000A34C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -76,6 +78,7 @@
7678
D50BE3F71C9FE8870000A34C /* BarcodeScannerExample */ = {
7779
isa = PBXGroup;
7880
children = (
81+
63C957FC1F74872600BAD365 /* Main.storyboard */,
7982
D50BE3F81C9FE8870000A34C /* AppDelegate.swift */,
8083
D50BE3FA1C9FE8870000A34C /* ViewController.swift */,
8184
D50BE3FF1C9FE8870000A34C /* Assets.xcassets */,
@@ -124,6 +127,7 @@
124127
D50BE3F41C9FE8870000A34C = {
125128
CreatedOnToolsVersion = 7.2.1;
126129
LastSwiftMigration = 0800;
130+
ProvisioningStyle = Manual;
127131
};
128132
};
129133
};
@@ -150,6 +154,7 @@
150154
isa = PBXResourcesBuildPhase;
151155
buildActionMask = 2147483647;
152156
files = (
157+
63C957FE1F74872600BAD365 /* Main.storyboard in Resources */,
153158
D50BE4031C9FE8870000A34C /* LaunchScreen.storyboard in Resources */,
154159
D50BE4001C9FE8870000A34C /* Assets.xcassets in Resources */,
155160
);
@@ -269,6 +274,14 @@
269274
/* End PBXSourcesBuildPhase section */
270275

271276
/* Begin PBXVariantGroup section */
277+
63C957FC1F74872600BAD365 /* Main.storyboard */ = {
278+
isa = PBXVariantGroup;
279+
children = (
280+
63C957FD1F74872600BAD365 /* Base */,
281+
);
282+
name = Main.storyboard;
283+
sourceTree = "<group>";
284+
};
272285
D50BE4011C9FE8870000A34C /* LaunchScreen.storyboard */ = {
273286
isa = PBXVariantGroup;
274287
children = (
@@ -325,7 +338,7 @@
325338
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
326339
GCC_WARN_UNUSED_FUNCTION = YES;
327340
GCC_WARN_UNUSED_VARIABLE = YES;
328-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
341+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
329342
MTL_ENABLE_DEBUG_INFO = YES;
330343
ONLY_ACTIVE_ARCH = YES;
331344
SDKROOT = iphoneos;
@@ -373,7 +386,7 @@
373386
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
374387
GCC_WARN_UNUSED_FUNCTION = YES;
375388
GCC_WARN_UNUSED_VARIABLE = YES;
376-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
389+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
377390
MTL_ENABLE_DEBUG_INFO = NO;
378391
SDKROOT = iphoneos;
379392
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -388,15 +401,17 @@
388401
buildSettings = {
389402
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
390403
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
391-
CODE_SIGN_IDENTITY = "iPhone Developer";
404+
CODE_SIGN_IDENTITY = "";
392405
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
406+
CODE_SIGN_STYLE = Manual;
393407
DEVELOPMENT_TEAM = "";
394408
INFOPLIST_FILE = BarcodeScannerExample/Info.plist;
395-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
409+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
396410
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
397411
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.BarcodeScannerExample2;
398412
PRODUCT_NAME = "$(TARGET_NAME)";
399413
PROVISIONING_PROFILE = "";
414+
PROVISIONING_PROFILE_SPECIFIER = "";
400415
SWIFT_VERSION = 4.0;
401416
TARGETED_DEVICE_FAMILY = "1,2";
402417
};
@@ -408,15 +423,17 @@
408423
buildSettings = {
409424
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
410425
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
411-
CODE_SIGN_IDENTITY = "iPhone Developer";
426+
CODE_SIGN_IDENTITY = "";
412427
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
428+
CODE_SIGN_STYLE = Manual;
413429
DEVELOPMENT_TEAM = "";
414430
INFOPLIST_FILE = BarcodeScannerExample/Info.plist;
415-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
431+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
416432
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
417433
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.BarcodeScannerExample2;
418434
PRODUCT_NAME = "$(TARGET_NAME)";
419435
PROVISIONING_PROFILE = "";
436+
PROVISIONING_PROFILE_SPECIFIER = "";
420437
SWIFT_VERSION = 4.0;
421438
TARGETED_DEVICE_FAMILY = "1,2";
422439
};

‎Example/BarcodeScannerExample/BarcodeScannerExample/AppDelegate.swift‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,8 @@ import BarcodeScanner
55
class AppDelegate: UIResponder, UIApplicationDelegate {
66

77
var window: UIWindow?
8-
9-
lazy var viewController: ViewController = {
10-
let controller = ViewController()
11-
return controller
12-
}()
13-
148
func application(_ application: UIApplication,
159
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
16-
window = UIWindow(frame: UIScreen.main.bounds)
17-
window?.rootViewController = viewController
18-
window?.makeKeyAndVisible()
19-
2010
return true
2111
}
2212
}

‎Example/BarcodeScannerExample/BarcodeScannerExample/Assets.xcassets/BarcodeScannerPresentation.imageset/BarcodeScannerPresentation-1.png‎

41.1 KB
Loading

‎Example/BarcodeScannerExample/BarcodeScannerExample/Assets.xcassets/BarcodeScannerPresentation.imageset/BarcodeScannerPresentation-2.png‎

41.1 KB
Loading

‎Example/BarcodeScannerExample/BarcodeScannerExample/Assets.xcassets/BarcodeScannerPresentation.imageset/BarcodeScannerPresentation.png‎

41.1 KB
Loading

‎Example/BarcodeScannerExample/BarcodeScannerExample/Assets.xcassets/BarcodeScannerPresentation.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "BarcodeScannerPresentation.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "BarcodeScannerPresentation-1.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "BarcodeScannerPresentation-2.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Example/BarcodeScannerExample/BarcodeScannerExample/Assets.xcassets/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎Example/BarcodeScannerExample/BarcodeScannerExample/Base.lproj/LaunchScreen.storyboard‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
510
</dependencies>
611
<scenes>
712
<!--View Controller-->
@@ -13,15 +18,23 @@
1318
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
1419
</layoutGuides>
1520
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
16-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
21+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1722
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<animations/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
23+
<subviews>
24+
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="BarcodeScannerPresentation" translatesAutoresizingMaskIntoConstraints="NO" id="Vxg-55-ejb">
25+
<rect key="frame" x="0.0" y="297" width="375" height="75"/>
26+
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
27+
</imageView>
28+
</subviews>
29+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2030
</view>
2131
</viewController>
2232
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
2333
</objects>
24-
<point key="canvasLocation" x="53" y="375"/>
34+
<point key="canvasLocation" x="52" y="374.66266866566718"/>
2535
</scene>
2636
</scenes>
37+
<resources>
38+
<image name="BarcodeScannerPresentation" width="1024" height="170"/>
39+
</resources>
2740
</document>

0 commit comments

Comments
 (0)