8000 Merge remote-tracking branch 'origin/master' into merge-release-in-ma… · NativeScript/NativeScript@2a899ee · GitHub
[go: up one dir, main page]
Skip to content

Commit 2a899ee

Browse files
SvetoslavTsenovSvetoslavTsenov
committed
Merge remote-tracking branch 'origin/master' into merge-release-in-master
10000 
2 parents fbe12fb + 8039c2c commit 2a899ee

File tree

198 files changed

+3345
-2331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+3345
-2331
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ package-lock.json
2121
.c9/
2222
*.launch
2323
.settings/
24+
.atom
2425

2526
# IDE - VSCode
2627
.vscode/*
@@ -30,6 +31,7 @@ package-lock.json
3031
!.vscode/extensions.json
3132

3233
# Appium files
34+
mochawesome-report
3335
e2e/**/*.trace/
3436
e2e/**/test-results.xml
3537
e2e/**/e2e/resources/

‎.travis.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,5 @@
1-
env:
2-
global:
3-
- DATE=$(date +%Y-%m-%d)
4-
- PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER
5-
language: objective-c
6-
osx_image: xcode10.2
7-
jdk:
8-
- oraclejdk8
9-
- openjdk8
101
script:
11-
- export JAVA_HOME=$HOME/openjdk8
12-
- $TRAVIS_BUILD_DIR/install-jdk.sh --install openjdk8 --target $JAVA_HOME
13-
- # do stuff with open OpenJDK 11
14-
- jdk_switcher use openjdk8
15-
install:
16-
# - brew update
17-
# - brew cask install android-sdk
18-
# Suppress output of sdkmanager to keep log under the 4MB limit of travis-ci
19-
# - yes | sdkmanager "platforms;android-28" >/dev/null
20-
# - yes | sdkmanager "build-tools;28.0.3" >/dev/null
21-
# - yes | sdkmanager "extras;android;m2repository" >/dev/null
22-
before_script:
23-
# - export ANDROID_HOME=/usr/local/share/android-sdk
24-
- npm install -g grunt-cli
25-
- npm install
26-
script:
27-
# - npm run setup-widgets
28-
- npm run setup
2+
- cd tns-core-modules && npm i && cd ..
3+
- npm install
294
- npm run tsc
30-
- npm run tslint
5+
- npm run tslint

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Use `AndroidApplication.startActivity`, `AndroidApplication.foregroundActivity`,
102102

103103
* `start(...)` method in `tns-core-modules/application` module is now removed.
104104

105-
Use `application.run(...)` method instead.
105+
Use `application.run(...)` method instead. Check the "Flexible Frame Composition" section in [this document](https://docs.google.com/document/d/1Iia0yEr5seq4H9qk4oMuJs4-M8dgmne98fymCO5IczA/edit) that explains the full migration path from `application.start(...)` to `application.run(...)` and the implications from this change
106106

107107

108108
* `loadPage(...)` method in `tns-core-modules/ui/builder` module is now removed.

‎e2e/animation/.gitignore

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎e2e/animation/README.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎e2e/animation/nsconfig.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎e2e/animation/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
},
1515
"dependencies": {
1616
"nativescript-theme-core": "~1.0.6",
17-
"tns-core-modules": "next"
17+
"tns-core-modules": "file:../../tns-core-modules"
1818
},
1919
"devDependencies": {
2020
"@types/chai": "~4.1.7",
2121
"@types/mocha": "~5.2.5",
22+
"@types/node": "~10.12.18",
2223
"babel-traverse": "6.26.0",
2324
"babel-types": "6.26.0",
2425
"babylon": "6.18.0",

‎e2e/animation/tsconfig.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
"emitDecoratorMetadata": true,
77
"noEmitHelpers": true,
88
"noEmitOnError": true,
9+
"skipLibCheck": true,
910
"lib": [
1011
"es6",
1112
"dom"
1213
],
1314
"baseUrl": ".",
1415
"paths": {
15-
"*": [
16-
"./node_modules/tns-core-modules/*",
17-
"./node_modules/*"
18-
],
1916
"~/*": [
2017
"app/*"
18+
],
19+
"*": [
20+
"./node_modules/*"
2121
]
2222
}
2323
},
2424
"exclude": [
25+
"e2e",
2526
"node_modules",
26-
"platforms",
27-
"e2e"
27+
"platforms"
2828
]
29-
}
29+
}

0 commit comments

Comments
 (0)
0