Skip to content

Commit 616aa6e

Browse files
3lvis3lvis
authored
Merge pull request #185 from gbreen12/master
Add Support For SPM
2 parents 6fe5bb5 + 0053a59 commit 616aa6e

File tree

23 files changed

+140
-29
lines changed

23 files changed

+140
-29
lines changed

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BarcodeScanner.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88

99
/* Begin PBXBuildFile section */
1010
2DBF9E0E1F169DEF006B5AA8 /* FocusViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2DBF9E0D1F169DEF006B5AA8 /* FocusViewType.swift */; };
11+
CE8C0771252FBBAF007FF4A4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE8C0770252FBBAF007FF4A4 /* Images.xcassets */; };
1112
D504555F1FD8714700E46826 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D504555E1FD8714700E46826 /* UIView+Extensions.swift */; };
12-
D50BE3E91C9FE7A80000A34C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E51C9FE7A80000A34C /* [email protected] */; };
13-
D50BE3EA1C9FE7A80000A34C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E61C9FE7A80000A34C /* [email protected] */; };
14-
D50BE3EB1C9FE7A80000A34C /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D50BE3E71C9FE7A80000A34C /* [email protected] */; };
15-
D5349DF8201E42D900CD53EA /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = D5349DF7201E42D900CD53EA /* [email protected] */; };
1613
D55281B62016758F00FF3CDD /* HeaderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B52016758F00FF3CDD /* HeaderViewController.swift */; };
1714
D55281B8201675D500FF3CDD /* MessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B7201675D500FF3CDD /* MessageViewController.swift */; };
1815
D55281BA2016770800FF3CDD /* CameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D55281B92016770800FF3CDD /* CameraViewController.swift */; };
@@ -28,11 +25,8 @@
2825

2926
/* Begin PBXFileReference section */
3027
2DBF9E0D1F169DEF006B5AA8 /* FocusViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = FocusViewType.swift; sourceTree = "<group>"; tabWidth = 2; };
28+
CE8C0770252FBBAF007FF4A4 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
3129
D504555E1FD8714700E46826 /* UIView+Extensions.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; tabWidth = 2; };
32-
D50BE3E51C9FE7A80000A34C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
33-
D50BE3E61C9FE7A80000A34C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
34-
D50BE3E71C9FE7A80000A34C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
35-
D5349DF7201E42D900CD53EA /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
3630
D55281B52016758F00FF3CDD /* HeaderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderViewController.swift; sourceTree = "<group>"; };
3731
D55281B7201675D500FF3CDD /* MessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageViewController.swift; sourceTree = "<group>"; };
3832
D55281B92016770800FF3CDD /* CameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraViewController.swift; sourceTree = "<group>"; };
@@ -62,10 +56,7 @@
6256
D50BE3E31C9FE7A80000A34C /* Images */ = {
6357
isa = PBXGroup;
6458
children = (
65-
D5349DF7201E42D900CD53EA /* [email protected] */,
66-
D50BE3E51C9FE7A80000A34C /* [email protected] */,
67-
D50BE3E61C9FE7A80000A34C /* [email protected] */,
68-
D50BE3E71C9FE7A80000A34C /* [email protected] */,
59+
CE8C0770252FBBAF007FF4A4 /* Images.xcassets */,
6960
);
7061
path = Images;
7162
sourceTree = "<group>";
@@ -95,7 +86,6 @@
9586
D5B2E8951C3A780C00C0327D = {
9687
isa = PBXGroup;
9788
children = (
98-
D50BE3E31C9FE7A80000A34C /* Images */,
9989
D5C629691C3A809D007F7B7C /* Sources */,
10090
D5C6295C1C3A800E007F7B7C /* BarcodeScanner */,
10191
D5B2E8A01C3A780C00C0327D /* Products */,
@@ -121,6 +111,7 @@
121111
D5C629691C3A809D007F7B7C /* Sources */ = {
122112
isa = PBXGroup;
123113
children = (
114+
D50BE3E31C9FE7A80000A34C /* Images */,
124115
D5CB3785201947D000B9319D /* Helpers */,
125116
D5CB37842019477900B9319D /* DataStructures */,
126117
D55281BD20167D9F00FF3CDD /* Extensions */,
@@ -218,10 +209,7 @@
218209
isa = PBXResourcesBuildPhase;
219210
buildActionMask = 2147483647;
220211
files = (
221-
D50BE3E91C9FE7A80000A34C /* [email protected] in Resources */,
222-
D5349DF8201E42D900CD53EA /* [email protected] in Resources */,
223-
D50BE3EB1C9FE7A80000A34C /* [email protected] in Resources */,
224-
D50BE3EA1C9FE7A80000A34C /* [email protected] in Resources */,
212+
CE8C0771252FBBAF007FF4A4 /* Images.xcassets in Resources */,
225213
);
226214
runOnlyForDeploymentPostprocessing = 0;
227215
};

‎Example/BarcodeScannerExample/BarcodeScannerExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Package.swift‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// swift-tools-version:5.3
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
4+
import PackageDescription
5+
6+
let package = Package(
7+
name: "BarcodeScanner",
8+
defaultLocalization: "en",
9+
platforms: [.iOS(.v10)],
10+
products: [
11+
// Products define the executables and libraries produced by a package, and make them visible to other packages.
12+
.library(
13+
name: "BarcodeScanner",
14+
targets: ["BarcodeScanner"]),
15+
],
16+
dependencies: [
17+
// Dependencies declare other packages that this package depends on.
18+
// .package(url: /* package url */, from: "1.0.0"),
19+
],
20+
targets: [
21+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
22+
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
23+
.target(
24+
name: "BarcodeScanner",
25+
path: "Sources",
26+
resources: [.copy("Images/[email protected]")]),
27+
]
28+
)

‎Sources/Helpers/Functions.swift‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@ import AVFoundation
77
- Returns: An image.
88
*/
99
func imageNamed(_ name: String) -> UIImage {
10-
let cls = BarcodeScannerViewController.self
11-
var bundle = Bundle(for: cls)
1210
let traitCollection = UITraitCollection(displayScale: 3)
1311

14-
if let resourceBundle = bundle.resourcePath.flatMap({ Bundle(path: $0 + "/BarcodeScanner.bundle") }) {
15-
bundle = resourceBundle
16-
}
17-
18-
guard let image = UIImage(named: name, in: bundle, compatibleWith: traitCollection) else {
12+
guard let image = UIImage(named: name, in: Bundle.module, compatibleWith: traitCollection) else {
1913
return UIImage()
2014
}
2115

@@ -28,11 +22,7 @@ func imageNamed(_ name: String) -> UIImage {
2822
- Returns: An image.
2923
*/
3024
func localizedString(_ key: String) -> String {
31-
if let path = Bundle(for: BarcodeScannerViewController.self).resourcePath,
32-
let resourceBundle = Bundle(path: path + "/Localization.bundle") {
33-
return resourceBundle.localizedString(forKey: key, value: nil, table: "Localizable")
34-
}
35-
return key
25+
NSLocalizedString(key, bundle: Bundle.module, comment: key)
3626
}
3727

3828
/// Checks if the app is running in Simulator.

‎Sources/Images/Images.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+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎Sources/Images/Images.xcassets/cameraRotate.imageset/Contents.json‎

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

Images/[email protected] renamed to Sources/Images/Images.xcassets/cameraRotate.imageset/[email protected]

File renamed without changes.

‎Sources/Images/Images.xcassets/flashOff.imageset/Contents.json‎

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

Images/[email protected] renamed to Sources/Images/Images.xcassets/flashOff.imageset/[email protected]

File renamed without changes.

0 commit comments

Comments
 (0)