Skip to content

Commit 2f66b0a

Browse files
E-B-SmithE-B-Smith
authored
Merge pull request #530 from BranchMetrics/TestBed-Swift
Test bed swift
2 parents 50b59cc + 00aee68 commit 2f66b0a

File tree

5 files changed

+51
-52
lines changed

5 files changed

+51
-52
lines changed

‎Branch-TestBed-Swift/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
platform :ios, '7.0'
22

33
target "TestBed-Swift" do
4-
pod 'Branch', :git => 'https://github.com/BranchMetrics/ios-branch-deep-linking.git', :branch => 'beta'
4+
pod 'Branch'
55
end

‎Branch-TestBed-Swift/TestBed-Swift.xcodeproj/project.pbxproj‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,15 @@
182182
isa = PBXNativeTarget;
183183
buildConfigurationList = 63AAF0E61CF758AF00CA98BD /* Build configuration list for PBXNativeTarget "TestBed-Swift" */;
184184
buildPhases = (
185+
157B558399395782A59ACE25 /* 📦 Check Pods Manifest.lock */,
185186
53D6781EE9D11F2C7024D630 /* [CP] Check Pods Manifest.lock */,
186187
63AAF0BA1CF758AF00CA98BD /* Sources */,
187188
63AAF0BB1CF758AF00CA98BD /* Frameworks */,
188189
63AAF0BC1CF758AF00CA98BD /* Resources */,
189190
BB9AF2760E0431DBA9ACAAF5 /* [CP] Embed Pods Frameworks */,
190191
17A9D1679810058127E69D7C /* [CP] Copy Pods Resources */,
192+
5033D238AD5FD489D640A977 /* 📦 Embed Pods Frameworks */,
193+
25D78C974E00503A57458168 /* 📦 Copy Pods Resources */,
191194
);
192195
buildRules = (
193196
);
@@ -255,6 +258,21 @@
255258
/* End PBXResourcesBuildPhase section */
256259

257260
/* Begin PBXShellScriptBuildPhase section */
261+
157B558399395782A59ACE25 /* 📦 Check Pods Manifest.lock */ = {
262+
isa = PBXShellScriptBuildPhase;
263+
buildActionMask = 2147483647;
264+
files = (
265+
);
266+
inputPaths = (
267+
);
268+
name = "📦 Check Pods Manifest.lock";
269+
outputPaths = (
270+
);
271+
runOnlyForDeploymentPostprocessing = 0;
272+
shellPath = /bin/sh;
273+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
274+
showEnvVarsInLog = 0;
275+
};
258276
17A9D1679810058127E69D7C /* [CP] Copy Pods Resources */ = {
259277
isa = PBXShellScriptBuildPhase;
260278
buildActionMask = 2147483647;
@@ -270,6 +288,36 @@
270288
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TestBed-Swift/Pods-TestBed-Swift-resources.sh\"\n";
271289
showEnvVarsInLog = 0;
272290
};
291+
25D78C974E00503A57458168 /* 📦 Copy Pods Resources */ = {
292+
isa = PBXShellScriptBuildPhase;
293+
buildActionMask = 2147483647;
294+
files = (
295+
);
296+
inputPaths = (
297+
);
298+
name = "📦 Copy Pods Resources";
299+
outputPaths = (
300+
);
301+
runOnlyForDeploymentPostprocessing = 0;
302+
shellPath = /bin/sh;
303+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TestBed-Swift/Pods-TestBed-Swift-resources.sh\"\n";
304+
showEnvVarsInLog = 0;
305+
};
306+
5033D238AD5FD489D640A977 /* 📦 Embed Pods Frameworks */ = {
307+
isa = PBXShellScriptBuildPhase;
308+
buildActionMask = 2147483647;
309+
files = (
310+
);
311+
inputPaths = (
312+
);
313+
name = "📦 Embed Pods Frameworks";
314+
outputPaths = (
315+
);
316+
runOnlyForDeploymentPostprocessing = 0;
317+
shellPath = /bin/sh;
318+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TestBed-Swift/Pods-TestBed-Swift-frameworks.sh\"\n";
319+
showEnvVarsInLog = 0;
320+
};
273321
53D6781EE9D11F2C7024D630 /* [CP] Check Pods Manifest.lock */ = {
274322
isa = PBXShellScriptBuildPhase;
275323
buildActionMask = 2147483647;

‎Branch-TestBed-Swift/TestBed-Swift/ContentViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ContentViewController: UIViewController {
4848
}
4949
} else if contentType == "FirstReferringParams" {
5050
if let firstReferringParams = Branch.getInstance().getFirstReferringParams() {
51-
content = String(format:"\nFirstReferringParams:\n\n%@", content, firstReferringParams.JSONDescription())
51+
content = String(format:"\nFirstReferringParams:\n\n%@", firstReferringParams.JSONDescription())
5252
print("Branch TestBed: FirstReferringParams:\n", content)
5353
}
5454
} else {

‎Branch-TestBed-Swift/TestBed-Swift/CreditHistoryViewController.swift‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,7 @@ class CreditHistoryViewController: UITableViewController {
8282
let dateString = transaction["date"] as! String
8383
let dateFormatter = DateFormatter()
8484

85-
print(dateString)
8685
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
87-
let test = dateFormatter.date(from: dateString)
88-
print(test)
8986
if let date = dateFormatter.date(from: dateString) {
9087
dateFormatter.dateStyle = .medium
9188
dateFormatter.timeStyle = .medium
@@ -98,51 +95,5 @@ class CreditHistoryViewController: UITableViewController {
9895

9996
return cell!
10097
}
101-
102-
103-
/*
104-
// Override to support conditional editing of the table view.
105-
override func tableView(tableView: UITableView, canEditRowAtIndexPath indexPath: NSIndexPath) -> Bool {
106-
// Return false if you do not want the specified item to be editable.
107-
return true
108-
}
109-
*/
110-
111-
/*
112-
// Override to support editing the table view.
113-
override func tableView(tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: NSIndexPath) {
114-
if editingStyle == .Delete {
115-
// Delete the row from the data source
116-
tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Fade)
117-
} else if editingStyle == .Insert {
118-
// Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
119-
}
120-
}
121-
*/
122-
123-
/*
124-
// Override to support rearranging the table view.
125-
override func tableView(tableView: UITableView, moveRowAtIndexPath fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) {
126-
127-
}
128-
*/
129-
130-
/*
131-
// Override to support conditional rearranging of the table view.
132-
override func tableView(tableView: UITableView, canMoveRowAtIndexPath indexPath: NSIndexPath) -> Bool {
133-
// Return false if you do not want the item to be re-orderable.
134-
return true
135-
}
136-
*/
137-
138-
/*
139-
// MARK: - Navigation
140-
141-
// In a storyboard-based application, you will often want to do a little preparation before navigation
142-
override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
143-
// Get the new view controller using segue.destinationViewController.
144-
// Pass the selected object to the new view controller.
145-
}
146-
*/
14798

14899
}

‎Branch-TestBed-Swift/TestBed-Swift/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>5</string>
20+
<string>6</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleURLTypes</key>

0 commit comments

Comments
 (0)