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 e8a711f..bec97d4 100644 --- a/demo-ng/package.json +++ b/demo-ng/package.json @@ -5,7 +5,7 @@ "version": "6.2.0" }, "tns-ios": { - "version": "6.2.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-2.0.0.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.2.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.3.0", + "tns-android": "6.2.0", + "tns-ios": "6.5.4", "typescript": "~3.5.3" } } diff --git a/demo/package.json b/demo/package.json index b5697e0..9f56495 100644 --- a/demo/package.json +++ b/demo/package.json @@ -5,7 +5,7 @@ "version": "6.2.0" }, "tns-android": { - "version": "6.2.0" + "version": "6.5.4" } }, "scripts": { @@ -31,10 +31,10 @@ "ci.tslint": "npm i && tslint --config '../tslint.json' 'demoapp/**/*.ts' --exclude '**/node_modules/**' --exclude '**/typings/**'" }, "dependencies": { - "nativescript-app-sync": "file:../publish/package/nativescript-app-sync-2.0.0.tgz", + "nativescript-app-sync": "file:../publish/package/nativescript-app-sync-3.0.0.tgz", "nativescript-theme-core": "~1.0.4", "nativescript-unit-test-runner": "0.7.0", - "tns-core-modules": "~6.2.0" + "tns-core-modules": "~6.5.24" }, "devDependencies": { "babel-traverse": "6.26.0", @@ -45,11 +45,12 @@ "karma": "4.1.0", "karma-jasmine": "2.0.1", "karma-nativescript-launcher": "^0.4.0", + "karma-webpack": "3.0.5", "lazy": "1.0.11", "nativescript-dev-webpack": "1.3.0", + "tns-ios": "6.5.4", "tns-platform-declarations": "~6.2.0", "tslint": "~5.20.0", - "typescript": "~3.5.3", - "karma-webpack": "3.0.5" + "typescript": "~3.5.3" } } diff --git a/src/package.json b/src/package.json index 8a808c5..4cf4a58 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-app-sync", - "version": "2.0.0", + "version": "3.0.0", "description": "Use AppSync to hot deploy updates to your app.", "main": "app-sync", "typings": "index.d.ts", @@ -70,7 +70,7 @@ "dependencies": { "nativescript-app-sync-sdk": "~1.0.1", "nativescript-appversion": "~1.4.4", - "nativescript-hook": "~0.2.5", + "nativescript-hook": "git://github.com/NativeScript/nativescript-hook.git#feat/ns7", "nativescript-zip": "~4.0.2" }, "devDependencies": { diff --git a/src/scripts/ios/appsync-ios.js b/src/scripts/ios/appsync-ios.js index e12db13..3859908 100644 --- a/src/scripts/ios/appsync-ios.js +++ b/src/scripts/ios/appsync-ios.js @@ -20,14 +20,14 @@ function patchUIApplicationMain(iosProjectFolder) { replaceInFile( appSyncFileDest, '#import ', - '#import \n#import ' + '#import \n#include ' ); // now inject the function call that determines the correct application path (either default or appsync'ed) replaceInFile( appSyncFileDest, - '[[NSBundle mainBundle] resourcePath]', - '[TNSAppSync applicationPathWithDefault:[[NSBundle mainBundle] resourcePath]]' + 'baseDir = [[NSBundle mainBundle] resourcePath];', + 'baseDir = [TNSAppSync applicationPathWithDefault:[NSBundle mainBundle].bundlePath];' ); }