diff --git a/demo-angular/nsconfig.json b/demo-angular/nsconfig.json index a64c9fa..b38346b 100644 --- a/demo-angular/nsconfig.json +++ b/demo-angular/nsconfig.json @@ -1,4 +1,4 @@ { "appResourcesPath": "App_Resources", "appPath": "src" -} +} \ No newline at end of file diff --git a/demo-angular/package.json b/demo-angular/package.json index b038d6d..c7a8a53 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -1,42 +1,40 @@ { - "nativescript": { - "id": "org.nativescript.demoangular", - "tns-android": { - "version": "5.4.0" - }, - "tns-ios": { - "version": "5.4.0" - } + "nativescript": { + "id": "org.nativescript.demoangular", + "tns-android": { + "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.0", - "nativescript-geolocation": "../src", - "nativescript-theme-core": "~1.0.4", - "nativescript-toast": "~2.0.0", - "tns-core-modules": "^5.0.0", - "reflect-metadata": "~0.1.10", - "rxjs": "~6.3.0", - "zone.js": "~0.8.18", - "tslint": "~5.11.0" - }, - "devDependencies": { - "@nativescript/schematics": "~0.5.0", - "nativescript-dev-typescript": "~0.9.0", - "nativescript-dev-webpack": "~0.22.0", - "@angular/compiler-cli": "~7.2.0", - "@ngtools/webpack": "~7.1.0" - }, - "scripts": { - "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'", - "build.plugin": "cd ../src && npm run build" + "tns-ios": { + "version": "6.0.1" } -} + }, + "dependencies": { + "@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.0", + "nativescript-geolocation": "../src", + "nativescript-theme-core": "~1.0.4", + "nativescript-toast": "~2.0.0", + "tns-core-modules": "^6.0.0", + "reflect-metadata": "~0.1.10", + "rxjs": "^6.3.3", + "zone.js": "^0.9.1", + "tslint": "~5.11.0" + }, + "devDependencies": { + "@nativescript/schematics": "~0.5.0", + "nativescript-dev-webpack": "~1.0.1", + "typescript": "~3.4.5" + }, + "scripts": { + "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'", + "build.plugin": "cd ../src && npm run build" + } +} \ No newline at end of file diff --git a/demo-vue/app/App_Resources/Android/AndroidManifest.xml b/demo-vue/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from demo-vue/app/App_Resources/Android/AndroidManifest.xml rename to demo-vue/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/demo-vue/app/App_Resources/Android/drawable-hdpi/background.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-hdpi/background.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/demo-vue/app/App_Resources/Android/drawable-hdpi/icon.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-hdpi/icon.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/demo-vue/app/App_Resources/Android/drawable-hdpi/logo.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-hdpi/logo.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/demo-vue/app/App_Resources/Android/drawable-ldpi/background.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-ldpi/background.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/demo-vue/app/App_Resources/Android/drawable-ldpi/icon.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-ldpi/icon.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/demo-vue/app/App_Resources/Android/drawable-ldpi/logo.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-ldpi/logo.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/demo-vue/app/App_Resources/Android/drawable-mdpi/background.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-mdpi/background.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/demo-vue/app/App_Resources/Android/drawable-mdpi/icon.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-mdpi/icon.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/demo-vue/app/App_Resources/Android/drawable-mdpi/logo.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-mdpi/logo.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/demo-vue/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/demo-vue/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/demo-vue/app/App_Resources/Android/drawable-xhdpi/background.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xhdpi/background.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xhdpi/icon.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xhdpi/icon.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xhdpi/logo.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xhdpi/logo.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xxhdpi/background.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xxhdpi/background.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xxhdpi/icon.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xxhdpi/logo.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xxxhdpi/background.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/demo-vue/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/demo-vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from demo-vue/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to demo-vue/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/demo-vue/app/App_Resources/Android/values-v21/colors.xml b/demo-vue/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from demo-vue/app/App_Resources/Android/values-v21/colors.xml rename to demo-vue/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/demo-vue/app/App_Resources/Android/values-v21/styles.xml b/demo-vue/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from demo-vue/app/App_Resources/Android/values-v21/styles.xml rename to demo-vue/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/demo-vue/app/App_Resources/Android/values/colors.xml b/demo-vue/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from demo-vue/app/App_Resources/Android/values/colors.xml rename to demo-vue/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/demo-vue/app/App_Resources/Android/values/styles.xml b/demo-vue/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from demo-vue/app/App_Resources/Android/values/styles.xml rename to demo-vue/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/demo-vue/package.json b/demo-vue/package.json index 8f17228..da8d74b 100644 --- a/demo-vue/package.json +++ b/demo-vue/package.json @@ -2,10 +2,10 @@ "nativescript": { "id": "org.nativescript.demovue", "tns-android": { - "version": "5.4.0" + "version": "6.0.0" }, "tns-ios": { - "version": "5.4.0" + "version": "6.0.1" } }, "scripts": { @@ -15,17 +15,17 @@ "nativescript-geolocation": "../src", "nativescript-theme-core": "~1.0.4", "nativescript-toast": "~2.0.0", - "nativescript-vue": "~2.2.0", - "tns-core-modules": "^5.0.0" + "nativescript-vue": "~2.3.0", + "tns-core-modules": "^6.0.0" }, "devDependencies": { "@babel/core": "~7.1.0", "@babel/preset-env": "~7.1.0", "babel-loader": "~8.0.0", - "nativescript-dev-webpack": "~0.22.0", - "nativescript-dev-typescript": "~0.9.0", - "nativescript-vue-template-compiler": "~2.2.0", - "node-sass": "~4.9.0", - "vue-loader": "~15.4.0" + "nativescript-dev-webpack": "~1.0.1", + "nativescript-vue-template-compiler": "~2.3.0", + "node-sass": "~4.12.0", + "vue-loader": "~15.4.0", + "typescript": "~3.4.5" } } diff --git a/demo/app/App_Resources/Android/AndroidManifest.xml b/demo/app/App_Resources/Android/src/main/AndroidManifest.xml similarity index 100% rename from demo/app/App_Resources/Android/AndroidManifest.xml rename to demo/app/App_Resources/Android/src/main/AndroidManifest.xml diff --git a/demo/app/App_Resources/Android/drawable-hdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-hdpi/background.png rename to demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png diff --git a/demo/app/App_Resources/Android/drawable-hdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-hdpi/icon.png rename to demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png diff --git a/demo/app/App_Resources/Android/drawable-hdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-hdpi/logo.png rename to demo/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png diff --git a/demo/app/App_Resources/Android/drawable-ldpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-ldpi/background.png rename to demo/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png diff --git a/demo/app/App_Resources/Android/drawable-ldpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-ldpi/icon.png rename to demo/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png diff --git a/demo/app/App_Resources/Android/drawable-ldpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-ldpi/logo.png rename to demo/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png diff --git a/demo/app/App_Resources/Android/drawable-mdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-mdpi/background.png rename to demo/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png diff --git a/demo/app/App_Resources/Android/drawable-mdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-mdpi/icon.png rename to demo/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png diff --git a/demo/app/App_Resources/Android/drawable-mdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-mdpi/logo.png rename to demo/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png diff --git a/demo/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/demo/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml similarity index 100% rename from demo/app/App_Resources/Android/drawable-nodpi/splash_screen.xml rename to demo/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml diff --git a/demo/app/App_Resources/Android/drawable-xhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xhdpi/background.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png diff --git a/demo/app/App_Resources/Android/drawable-xhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xhdpi/icon.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png diff --git a/demo/app/App_Resources/Android/drawable-xhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xhdpi/logo.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png diff --git a/demo/app/App_Resources/Android/drawable-xxhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xxhdpi/background.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png diff --git a/demo/app/App_Resources/Android/drawable-xxhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xxhdpi/icon.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png diff --git a/demo/app/App_Resources/Android/drawable-xxhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xxhdpi/logo.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png diff --git a/demo/app/App_Resources/Android/drawable-xxxhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xxxhdpi/background.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png diff --git a/demo/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xxxhdpi/icon.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png diff --git a/demo/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from demo/app/App_Resources/Android/drawable-xxxhdpi/logo.png rename to demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png diff --git a/demo/app/App_Resources/Android/values-v21/colors.xml b/demo/app/App_Resources/Android/src/main/res/values-v21/colors.xml similarity index 100% rename from demo/app/App_Resources/Android/values-v21/colors.xml rename to demo/app/App_Resources/Android/src/main/res/values-v21/colors.xml diff --git a/demo/app/App_Resources/Android/values-v21/styles.xml b/demo/app/App_Resources/Android/src/main/res/values-v21/styles.xml similarity index 100% rename from demo/app/App_Resources/Android/values-v21/styles.xml rename to demo/app/App_Resources/Android/src/main/res/values-v21/styles.xml diff --git a/demo/app/App_Resources/Android/values/colors.xml b/demo/app/App_Resources/Android/src/main/res/values/colors.xml similarity index 100% rename from demo/app/App_Resources/Android/values/colors.xml rename to demo/app/App_Resources/Android/src/main/res/values/colors.xml diff --git a/demo/app/App_Resources/Android/values/styles.xml b/demo/app/App_Resources/Android/src/main/res/values/styles.xml similarity index 100% rename from demo/app/App_Resources/Android/values/styles.xml rename to demo/app/App_Resources/Android/src/main/res/values/styles.xml diff --git a/demo/package.json b/demo/package.json index 61942aa..94031fe 100644 --- a/demo/package.json +++ b/demo/package.json @@ -2,18 +2,18 @@ "nativescript": { "id": "org.nativescript.demo", "tns-android": { - "version": "5.4.0" + "version": "6.0.0" }, "tns-ios": { - "version": "5.4.0" + "version": "6.0.1" } }, "dependencies": { "nativescript-geolocation": "../src", "nativescript-theme-core": "^1.0.4", "nativescript-toast": "~2.0.0", - "nativescript-unit-test-runner": "0.6.3", - "tns-core-modules": "^5.0.0" + "nativescript-unit-test-runner": "0.7.0", + "tns-core-modules": "^6.0.0" }, "devDependencies": { "jasmine-core": "^2.5.2", @@ -21,11 +21,11 @@ "karma-jasmine": "2.0.1", "karma-nativescript-launcher": "^0.4.0", "nativescript-css-loader": "~0.26.0", - "nativescript-dev-typescript": "~0.10.0", - "nativescript-dev-webpack": "~0.24.0", - "tns-platform-declarations": "^5.0.0", + "nativescript-dev-webpack": "~1.0.1", + "tns-platform-declarations": "^6.0.0", "tslint": "~5.11.0", - "karma-webpack": "3.0.5" + "karma-webpack": "3.0.5", + "typescript": "~3.4.5" }, "scripts": { "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'", diff --git a/src/package.json b/src/package.json index e9b1a0d..62b702e 100644 --- a/src/package.json +++ b/src/package.json @@ -18,8 +18,8 @@ "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude \"*demo*/platforms/**\"", "plugin.link": "npm link && cd ../demo && npm link nativescript-geolocation && cd ../src", "plugin.tscwatch": "npm run tsc -- -w", - "demo.ios": "npm i && npm run tsc && cd ../demo && tns run ios --syncAllFiles", - "demo.android": "npm i && npm run tsc && cd ../demo && tns run android --syncAllFiles", + "demo.ios": "npm i && npm run tsc && cd ../demo && tns run ios", + "demo.android": "npm i && npm run tsc && cd ../demo && tns run android", "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**'" }, "repository": {