Skip to content

Commit

Permalink
Merge pull request #61 from Capstone-Projects-2020-Spring/liamUnitTes…
Browse files Browse the repository at this point in the history
…ting

Needs to be fixed later
  • Loading branch information
ApplebaumIan authored Dec 10, 2020
2 parents 9973cee + deffb1b commit 59883ae
Show file tree
Hide file tree
Showing 8 changed files with 349 additions and 258 deletions.
3 changes: 0 additions & 3 deletions ImageClassification.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@
isa = PBXGroup;
children = (
602A2224245529AC00800829 /* SpeechToTextVCTest.swift */,
6E045A8A24560A8400C4E53C /* 1FirstTest.swift */,
602A22222455299A00800829 /* iASLUITests.swift */,
67ABF91E24301C1C00881646 /* Info.plist */,
67ABF92524301CCE00881646 /* ASLKeyboardUITests.swift */,
Expand Down Expand Up @@ -596,9 +595,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6E045A892455EB8C00C4E53C /* SpeechToTextVCTest.swift in Sources */,
606C60D2244AC7810090A4AC /* ChatVCUITests.swift in Sources */,
6E045A8B24560A8400C4E53C /* 1FirstTest.swift in Sources */,
606C60D4244ACCE80090A4AC /* LoginVCUITests.swift in Sources */,
6EF769D8244B75AF00462E31 /* ViewControllerUITests.swift in Sources */,
67ABF92624301CCE00881646 /* ASLKeyboardUITests.swift in Sources */,
Expand Down
1 change: 1 addition & 0 deletions ImageClassification/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD

self.window?.makeKeyAndVisible()


// if CommandLine.arguments.contains("--MonkeyPaws") {
// paws = MonkeyPaws(view: window!)
// }
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target 'ImageClassification' do
pod 'Firebase/Messaging'
pod 'SwiftLint'
pod 'SwiftMonkeyPaws', '~> 2.1.0'
pod 'AppleWelcomeScreen'
pod 'AppleWelcomeScreen','~> 1.0.1'
pod 'YouTubePlayer', :git => 'https://github.com/weakfl/Swift-YouTube-Player.git', :branch => 'use-wkwebview' # replace with original pod after the pull request got merged
# pod 'SwiftVideoRecorder',:git => 'https://github.com/ApplebaumIan/swift-video-recorder.git', :branch => 'master'
pod "SwiftyCam"
Expand Down
Loading

0 comments on commit 59883ae

Please sign in to comment.