Skip to content

Commit 59883ae

Browse files
authored
Merge pull request #61 from Capstone-Projects-2020-Spring/liamUnitTesting
Needs to be fixed later
2 parents 9973cee + deffb1b commit 59883ae

File tree

8 files changed

+349
-258
lines changed

8 files changed

+349
-258
lines changed

ImageClassification.xcodeproj/project.pbxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217
isa = PBXGroup;
218218
children = (
219219
602A2224245529AC00800829 /* SpeechToTextVCTest.swift */,
220-
6E045A8A24560A8400C4E53C /* 1FirstTest.swift */,
221220
602A22222455299A00800829 /* iASLUITests.swift */,
222221
67ABF91E24301C1C00881646 /* Info.plist */,
223222
67ABF92524301CCE00881646 /* ASLKeyboardUITests.swift */,
@@ -596,9 +595,7 @@
596595
isa = PBXSourcesBuildPhase;
597596
buildActionMask = 2147483647;
598597
files = (
599-
6E045A892455EB8C00C4E53C /* SpeechToTextVCTest.swift in Sources */,
600598
606C60D2244AC7810090A4AC /* ChatVCUITests.swift in Sources */,
601-
6E045A8B24560A8400C4E53C /* 1FirstTest.swift in Sources */,
602599
606C60D4244ACCE80090A4AC /* LoginVCUITests.swift in Sources */,
603600
6EF769D8244B75AF00462E31 /* ViewControllerUITests.swift in Sources */,
604601
67ABF92624301CCE00881646 /* ASLKeyboardUITests.swift in Sources */,

ImageClassification/AppDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
121121

122122
self.window?.makeKeyAndVisible()
123123

124+
124125
// if CommandLine.arguments.contains("--MonkeyPaws") {
125126
// paws = MonkeyPaws(view: window!)
126127
// }

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ target 'ImageClassification' do
2020
pod 'Firebase/Messaging'
2121
pod 'SwiftLint'
2222
pod 'SwiftMonkeyPaws', '~> 2.1.0'
23-
pod 'AppleWelcomeScreen'
23+
pod 'AppleWelcomeScreen','~> 1.0.1'
2424
pod 'YouTubePlayer', :git => 'https://github.com/weakfl/Swift-YouTube-Player.git', :branch => 'use-wkwebview' # replace with original pod after the pull request got merged
2525
# pod 'SwiftVideoRecorder',:git => 'https://github.com/ApplebaumIan/swift-video-recorder.git', :branch => 'master'
2626
pod "SwiftyCam"

0 commit comments

Comments
 (0)