Skip to content

Integrate watson assistant #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
silvanagarci wants to merge 8 commits into
base: integrateWatsonAssistant
Choose a base branch
from
Open

Integrate watson assistant #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3bc10f9
Adding in travis CI
maxdignan Sep 10, 2019
43a4bf4
Testing CI
maxdignan Sep 10, 2019
c84709d
Fixing build 2
maxdignan Sep 12, 2019
8360324
Get tests working 3
maxdignan Sep 12, 2019
183bd88
Merge pull request #1 from Nova-Inc-osu/maxdignan-test-pr
maxdignan Sep 12, 2019
7a48ada
Changed origin and apikey
silvanagarci Sep 19, 2019
55e0e11
Updated Credentials
silvanagarci Sep 19, 2019
16a642e
Merge branch 'master' into integrateWatsonAssistant
maxdignan Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
osx_image: xcode10.1
language: swift
os: osx
xcode_project: Nova.xcodeproj
xcode_scheme: Nova
xcode_destination: platform=iOS Simulator,OS=12.2,name=iPhone 8
script:
- set -o pipefail
- xcodebuild build -workspace Nova.xcworkspace -scheme "Nova" -sdk iphonesimulator | xcpretty
12 changes: 6 additions & 6 deletions Nova.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
B14E90492334234600484BCC /* Credentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = B14E90482334234600484BCC /* Credentials.swift */; };
B15A9F20231F088A005EEDC4 /* PatientListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B15A9F1E231F088A005EEDC4 /* PatientListViewController.swift */; };
B15A9F21231F088A005EEDC4 /* PatientListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B15A9F1F231F088A005EEDC4 /* PatientListViewController.xib */; };
B15AB15E23317BD100A05755 /* GeneralConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = B15AB15D23317BD100A05755 /* GeneralConstants.swift */; };
B15AB1602331819F00A05755 /* Credentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = B15AB15F2331819F00A05755 /* Credentials.swift */; };
B1832585231F22DC00EE0A6A /* PatientProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1832583231F22DC00EE0A6A /* PatientProfileViewController.swift */; };
B1832586231F22DC00EE0A6A /* PatientProfileViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B1832584231F22DC00EE0A6A /* PatientProfileViewController.xib */; };
B1E813FC231892E600219768 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E813FB231892E600219768 /* AppDelegate.swift */; };
Expand Down Expand Up @@ -58,10 +58,10 @@
6A7582D0AC6266754C64789E /* Pods_NovaUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NovaUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
818D933AFF01B0B876498331 /* Pods-Nova.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nova.debug.xcconfig"; path = "Target Support Files/Pods-Nova/Pods-Nova.debug.xcconfig"; sourceTree = "<group>"; };
A6A64939511B8B8B9047B23E /* Pods-NovaUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NovaUITests.debug.xcconfig"; path = "Target Support Files/Pods-NovaUITests/Pods-NovaUITests.debug.xcconfig"; sourceTree = "<group>"; };
B14E90482334234600484BCC /* Credentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
B15A9F1E231F088A005EEDC4 /* PatientListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatientListViewController.swift; sourceTree = "<group>"; };
B15A9F1F231F088A005EEDC4 /* PatientListViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PatientListViewController.xib; sourceTree = "<group>"; };
B15AB15D23317BD100A05755 /* GeneralConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralConstants.swift; sourceTree = "<group>"; };
B15AB15F2331819F00A05755 /* Credentials.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = "<group>"; };
B1832583231F22DC00EE0A6A /* PatientProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatientProfileViewController.swift; sourceTree = "<group>"; };
B1832584231F22DC00EE0A6A /* PatientProfileViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PatientProfileViewController.xib; sourceTree = "<group>"; };
B1E813F8231892E600219768 /* Nova.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nova.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -227,7 +227,7 @@
children = (
B1E81402231892E800219768 /* Assets.xcassets */,
B15AB15D23317BD100A05755 /* GeneralConstants.swift */,
B15AB15F2331819F00A05755 /* Credentials.swift */,
B14E90482334234600484BCC /* Credentials.swift */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -522,7 +522,7 @@
B1E813FE231892E600219768 /* LaunchViewController.swift in Sources */,
B1E8143D2318AB2900219768 /* RegistrationViewController.swift in Sources */,
B15A9F20231F088A005EEDC4 /* PatientListViewController.swift in Sources */,
B15AB1602331819F00A05755 /* Credentials.swift in Sources */,
B14E90492334234600484BCC /* Credentials.swift in Sources */,
B1E814462318CC7000219768 /* Message.swift in Sources */,
B15AB15E23317BD100A05755 /* GeneralConstants.swift in Sources */,
B1E814412318B6FA00219768 /* ChatViewController.swift in Sources */,
Expand Down Expand Up @@ -712,7 +712,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = silvanagarcia.Nova;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -731,7 +731,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = silvanagarcia.Nova;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
14 changes: 14 additions & 0 deletions Nova.xcodeproj/xcuserdata/maxdignan.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Nova.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Nova.xcodeproj/xcuserdata/silvanagarcia.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>Nova.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
<integer>6</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file modified Nova.xcworkspace/xcuserdata/silvanagarcia.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions Nova/Supporting Files/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IbmKey</key>
<string>5FJu_Um5eTGLhga3J4Kx-IwnXlLsIJWjAnMhS-GOPvWz</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand Down
17 changes: 11 additions & 6 deletions Pods/Pods.xcodeproj/xcuserdata/silvanagarcia.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions blah
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hi there!