Merge branch 'master' into SWF-10-account-details

rrk12005 · Mar 6, 2019 · 77f7f65 · 77f7f65
2 parents 8999883 + 61aca57
commit 77f7f65
Show file tree

Hide file tree

Showing 16 changed files with 275 additions and 22 deletions.
diff --git a/SynchronyFinancial/Podfile.lock b/SynchronyFinancial/Podfile.lock
@@ -1,3 +1,16 @@
-PODFILE CHECKSUM: f44dd0f838ce6fa6c8b393964951c4516d14d627
+PODS:
+  - SwiftLint (0.27.0)
+
+DEPENDENCIES:
+  - SwiftLint
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - SwiftLint
+
+SPEC CHECKSUMS:
+  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
+
+PODFILE CHECKSUM: 4677f0f790934708825f5fcde561667ebefd2df5
 
 COCOAPODS: 1.5.3
diff --git a/SynchronyFinancial/Pods/Manifest.lock b/SynchronyFinancial/Pods/Manifest.lock
diff --git a/SynchronyFinancial/Pods/Pods.xcodeproj/project.pbxproj b/SynchronyFinancial/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/SynchronyFinancial/Pods/SwiftLint/LICENSE b/SynchronyFinancial/Pods/SwiftLint/LICENSE
diff --git a/SynchronyFinancial/Pods/SwiftLint/swiftlint b/SynchronyFinancial/Pods/SwiftLint/swiftlint
diff --git a/...ial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.markdown b/...ial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.markdown
diff --git a/...nchronyFinancial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.plist b/...nchronyFinancial WatchKit App/Pods-SynchronyFinancial WatchKit App-acknowledgements.plist
diff --git a/... Extension/Pods-SynchronyFinancial WatchKit Extension-acknowledgements.markdown b/... Extension/Pods-SynchronyFinancial WatchKit Extension-acknowledgements.markdown
diff --git a/...cial WatchKit Extension/Pods-SynchronyFinancial WatchKit Extension-acknowledgements.plist b/...cial WatchKit Extension/Pods-SynchronyFinancial WatchKit Extension-acknowledgements.plist
diff --git a/...Files/Pods-SynchronyFinancial/Pods-SynchronyFinancial-acknowledgements.markdown b/...Files/Pods-SynchronyFinancial/Pods-SynchronyFinancial-acknowledgements.markdown
diff --git a/...rget Support Files/Pods-SynchronyFinancial/Pods-SynchronyFinancial-acknowledgements.plist b/...rget Support Files/Pods-SynchronyFinancial/Pods-SynchronyFinancial-acknowledgements.plist
diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/ExtensionDelegate.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/ExtensionDelegate.swift
@@ -8,6 +8,7 @@
 
 import WatchKit
 
+//swiftlint:disable line_length
 class ExtensionDelegate: NSObject, WKExtensionDelegate {
 
     func applicationDidFinishLaunching() {

diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/MainMenuInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/MainMenuInterfaceController.swift
@@ -15,7 +15,7 @@ class MainMenuInterfaceController: WKInterfaceController {
 
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
-        
+
         // Configure interface objects here.
     }