Update to latest serenity js version

package.json

@@ -25,23 +25,24 @@
     "url": "https://github.com/serenity-js/tutorial-cross-app-testing/issues"
   },
   "homepage": "https://github.com/serenity-js/tutorial-cross-app-testing#readme",
-  "devDependencies": {
-    "@types/chai": "3.5.0",
-    "@types/chai-as-promised": "0.0.30",
-    "@types/mocha": "2.2.40",
-    "@types/node": "7.0.12",
-    "chai": "3.5.0",
-    "chai-as-promised": "6.0.0",
-    "mocha": "3.2.0",
+  "dependencies": {
+    "@serenity-js/core": "^1.5.5",
+    "@types/chai": "4.1.0",
+    "@types/chai-as-promised": "7.1.0",
+    "@types/mocha": "2.2.46",
+    "@types/node": "9.3.0",
+    "chai": "4.1.2",
+    "chai-as-promised": "7.1.1",
+    "mocha": "4.1.0",
     "npm-failsafe": "0.2.1",
-    "protractor": "5.1.1",
-    "rimraf": "2.6.1",
-    "serenity-cli": "0.2.4",
-    "serenity-js": "1.3.0",
-    "ts-node": "3.0.2",
-    "tslint": "5.1.0",
-    "tslint-microsoft-contrib": "4.0.1",
-    "typescript": "2.2.2"
+    "protractor": "5.2.2",
+    "rimraf": "2.6.2",
+    "serenity-cli": "0.7.1",
+    "serenity-js": "1.10.1",
+    "ts-node": "4.1.0",
+    "tslint": "5.8.0",
+    "tslint-microsoft-contrib": "5.0.1",
+    "typescript": "2.6.2"
   },
   "engines": {
     "node": ">= 6.9.x"

protractor.conf.js

@@ -19,5 +19,5 @@ exports.config = {
         browserName: 'chrome'
     },
 
-    restartBrowserBetweenTests: true,
+    restartBrowserBetweenTests: false,
 };

spec/cross-app.spec.ts

@@ -1,7 +1,6 @@
 import { protractor } from 'protractor';
-import { BrowseTheWeb } from 'serenity-js/lib/serenity-protractor';
-import { Actor } from 'serenity-js/lib/serenity/screenplay';
 
+import { Actor, BrowseTheWeb } from 'serenity-js/lib/screenplay-protractor';
 import { Ensure, Multiply } from '../src/calculator';
 import { Google, SelectResult } from '../src/google';
 

src/calculator/ensure.ts

@@ -1,8 +1,5 @@
-import { Text } from 'serenity-js/lib/serenity-protractor';
-import { step } from 'serenity-js/lib/serenity/recording';
-import { PerformsTasks, See, Task } from 'serenity-js/lib/serenity/screenplay';
-import { Assertion } from 'serenity-js/lib/serenity/screenplay/expectations';
-
+import { Assertion } from '@serenity-js/core/lib/screenplay/expectations';
+import { PerformsTasks, See, step, Task, Text } from 'serenity-js/lib/screenplay-protractor';
 import { Calculator } from './ui/calculator';
 
 export class Ensure implements Task {

src/calculator/multiply.ts

@@ -1,6 +1,4 @@
-import { Click, Enter, Select, UseAngular } from 'serenity-js/lib/serenity-protractor';
-import { step } from 'serenity-js/lib/serenity/recording';
-import { PerformsTasks, Task } from 'serenity-js/lib/serenity/screenplay';
+import { Click, Enter, PerformsTasks, Select, step, Task, UseAngular } from 'serenity-js/lib/screenplay-protractor';
 
 import { Calculator } from './ui/calculator';
 

src/google/google.ts

@@ -1,7 +1,5 @@
 import { protractor } from 'protractor';
-import { Enter, Open, UseAngular } from 'serenity-js/lib/serenity-protractor';
-import { step } from 'serenity-js/lib/serenity/recording';
-import { PerformsTasks, Task } from 'serenity-js/lib/serenity/screenplay';
+import { Enter, Open, PerformsTasks, step, Task, UseAngular } from 'serenity-js/lib/screenplay-protractor';
 
 import { GoogleSearch } from './ui/google_search';
 

src/google/select_result.ts

@@ -1,6 +1,4 @@
-import { Click, Is, Wait } from 'serenity-js/lib/serenity-protractor';
-import { step } from 'serenity-js/lib/serenity/recording';
-import { PerformsTasks, Task } from 'serenity-js/lib/serenity/screenplay';
+import { Click, Is, PerformsTasks, step, Task, Wait } from 'serenity-js/lib/screenplay-protractor';
 
 import { GoogleSearch } from './ui/google_search';
 

src/google/ui/google_search.ts

@@ -1,5 +1,5 @@
 import { by } from 'protractor';
-import { Target } from 'serenity-js/lib/serenity-protractor';
+import { Target } from 'serenity-js/lib/screenplay-protractor';
 
 export class GoogleSearch {
     static Query  = Target.the('Query').located(by.name('q'));

tslint.json

@@ -37,6 +37,7 @@
     "only-arrow-functions": false,
     "arrow-parens": [true, "ban-single-arg-parens" ],
     "max-classes-per-file": false,
-    "mocha-avoid-only": true
+    "mocha-avoid-only": true,
+    "no-submodule-imports": false
   }
-}
+}