diff --git a/.gitignore b/.gitignore index 14e2a2e..f93800f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ demo/platforms publish/src publish/package -node_modules \ No newline at end of file +node_modules +package-lock.json \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 0f12e0a..05a549d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: os: osx env: - WebPack="iOS" - osx_image: xcode10.2 + osx_image: xcode12.2 language: node_js node_js: "10" jdk: oraclejdk8 @@ -23,15 +23,15 @@ matrix: jdk: oraclejdk8 before_install: nvm install 10 script: - - cd src && npm i && npm run preparedemo && cd ../demo && tns build android + - cd src && npm i && npm run preparedemo && cd ../demo-ng && tns build android - os: osx - osx_image: xcode10.2 + osx_image: xcode12.2 language: node_js node_js: "10" jdk: oraclejdk8 before_script: pod repo update script: - - cd src && npm i && npm run preparedemo && cd ../demo && tns build ios + - cd src && npm i && npm run preparedemo && cd ../demo-ng && tns build ios android: components: diff --git a/demo-ng/package.json b/demo-ng/package.json index ef3c0dd..bec97d4 100644 --- a/demo-ng/package.json +++ b/demo-ng/package.json @@ -2,10 +2,10 @@ "nativescript": { "id": "org.nativescript.demong.AppSync", "tns-android": { - "version": "6.1.2" + "version": "6.2.0" }, "tns-ios": { - "version": "6.1.0" + "version": "6.5.4" } }, "description": "NativeScript Application", @@ -43,17 +43,19 @@ "@angular/platform-browser-dynamic": "~8.2.3", "@angular/router": "~8.2.3", "nativescript-angular": "~8.2.0", - "nativescript-app-sync": "file:../publish/package/nativescript-app-sync-1.0.7.tgz", + "nativescript-app-sync": "file:../publish/package/nativescript-app-sync-3.0.0.tgz", "nativescript-theme-core": "~1.0.6", "reflect-metadata": "~0.1.13", "rxjs": "~6.5.2", - "tns-core-modules": "~6.1.0", + "tns-core-modules": "~6.5.24", "zone.js": "~0.10.0" }, "devDependencies": { "@angular/compiler-cli": "~8.2.3", "@ngtools/webpack": "~8.2.2", - "nativescript-dev-webpack": "~1.2.0", - "typescript": "3.4.5" + "nativescript-dev-webpack": "~1.3.0", + "tns-android": "6.2.0", + "tns-ios": "6.5.4", + "typescript": "~3.5.3" } } diff --git a/demo/demoapp/main-page.xml b/demo/demoapp/main-page.xml index 84f3d93..f3bc12c 100644 --- a/demo/demoapp/main-page.xml +++ b/demo/demoapp/main-page.xml @@ -2,8 +2,8 @@ - -