Skip to content

Commit

Permalink
Update to NS6 (#80)
Browse files Browse the repository at this point in the history
* Update angular-demo to NS6

* Update demo to NS6

* Update android-sdk to 10.2.1

* Remove dev-typescript

* restore SDK 8.7.0

* Use androidx

* fix namespace

* fix app start

* remove bundle and uglify

* Update {N} version on travis

* Update xcode and node versions

* Fix frame is undefined

* Add webpack configs to demos

* Changelog

* Remove unused import
  • Loading branch information
jeremypele authored and RobertGardner committed Aug 22, 2019
1 parent 1e99f2e commit 9960971
Show file tree
Hide file tree
Showing 64 changed files with 752 additions and 235 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ demo-angular/*.d.ts
publish/src
publish/package
*.metadata.json

!**/webpack.config.js
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ matrix:
- stage: "Lint"
language: node_js
os: linux
node_js: "10"
node_js: "11"
script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint && cd ../demo-angular && npm run ci.tslint
- stage: "WebPack and Build"
os: osx
env:
- WebPack="iOS"
osx_image: xcode9.3
osx_image: xcode11
language: node_js
node_js: "10"
node_js: "11"
jdk: oraclejdk8
before_install:
- travis_wait pod repo update --silent
Expand All @@ -24,7 +24,7 @@ matrix:
env:
- WebPack="Android"
jdk: oraclejdk8
before_install: nvm install 10
before_install: nvm install 11
script:
- cd src && npm i
- cd ../demo && npm i && npm run build.plugin && tns build android --bundle --env.uglify --env.snapshot
Expand All @@ -34,16 +34,16 @@ matrix:
- BuildAndroid="27"
os: linux
jdk: oraclejdk8
before_install: nvm install 10
before_install: nvm install 11
script:
- cd src && npm i && npm run tsc && cd ../demo && tns build android && cd ../demo-angular && tns build android
- os: osx
env:
- BuildiOS="11"
- Xcode="9.3"
osx_image: xcode9.3
- Xcode="11.0"
osx_image: xcode11
language: node_js
node_js: "10"
node_js: "11"
jdk: oraclejdk8
before_install:
- travis_wait pod repo update --silent
Expand All @@ -63,7 +63,7 @@ android:
- sys-img-armeabi-v7a-android-21

install:
- echo no | npm install -g nativescript@5.4.2
- echo no | npm install -g nativescript
- tns --version
- tns usage-reporting disable
- tns error-reporting disable
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changelog
==============================

## 5.5.0 (2019, August 20)
### Updates
- Nativescript 6 compatibility

### Warning
- Consider freezing your version to 5.4.2 if using {N} < 6.0 (not tested)

## 5.4.2 (2019, June 28)
### Implements
- [(# 75)](https://github.com/triniwiz/nativescript-stripe/issues/75) Remove calls to deprecated utils.ios.getter.
Expand Down
41 changes: 20 additions & 21 deletions demo-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,42 @@
"nativescript": {
"id": "org.nativescript.stripe.demoangular",
"tns-ios": {
"version": "5.3.1"
"version": "6.0.1"
},
"tns-android": {
"version": "5.3.1"
"version": "6.0.0"
}
},
"dependencies": {
"@angular/animations": "~7.2.0",
"@angular/common": "~7.2.0",
"@angular/compiler": "~7.2.0",
"@angular/core": "~7.2.0",
"@angular/forms": "~7.2.0",
"@angular/http": "~7.2.0",
"@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0",
"nativescript-angular": "^7.2.3",
"@angular/animations": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"nativescript-angular": "8.0.2",
"nativescript-stripe": "file:../src",
"nativescript-theme-core": "~1.0.4",
"reflect-metadata": "~0.1.12",
"rxjs": "^6.3.3",
"tns-core-modules": "^5.3.1",
"zone.js": "^0.8.4",
"typescript": "~3.1.1"
"tns-core-modules": "6.0.1",
"zone.js": "0.9.1"
},
"devDependencies": {
"@angular/compiler-cli": "~7.2.0",
"@ngtools/webpack": "~7.2.0",
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.0",
"babel-traverse": "6.26.0",
"babel-types": "6.26.0",
"babylon": "6.18.0",
"lazy": "1.0.11",
"nativescript-css-loader": "~0.26.1",
"nativescript-dev-typescript": "^0.9.0",
"nativescript-dev-webpack": "^0.22.0-next-2019-04-12-181144-02",
"tns-platform-declarations": "^5.3.1",
"tslint": "~5.4.3"
"nativescript-dev-webpack": "1.0.1",
"tns-platform-declarations": "6.0.1",
"tslint": "~5.4.3",
"typescript": "3.4.5"
},
"scripts": {
"build.plugin": "cd ../src && npm run build",
Expand Down
Loading

0 comments on commit 9960971

Please sign in to comment.