diff --git a/demo-angular/package.json b/demo-angular/package.json index e1e0270..bd42642 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -6,10 +6,10 @@ "nativescript": { "id": "org.nativescript.demo.angular", "tns-android": { - "version": "5.4.0" + "version": "6.0.0" }, "tns-ios": { - "version": "5.4.0" + "version": "6.0.1" } }, "scripts": { @@ -32,17 +32,16 @@ "nativescript-camera": "../src", "nativescript-theme-core": "^1.0.4", "rxjs": "^6.3.3", - "tns-core-modules": "^5.0.0", - "zone.js": "^0.8.4", - "typescript": "~3.4.5" + "tns-core-modules": "^6.0.0", + "zone.js": "^0.8.4" }, "devDependencies": { "@angular/compiler-cli": "~8.0.0", "@ngtools/webpack": "~8.0.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", - "tslint": "~5.11.0" + "nativescript-dev-webpack": "~1.0.1", + "tns-platform-declarations": "^6.0.0", + "tslint": "~5.11.0", + "typescript": "~3.4.5" } } 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 4cade8d..143f343 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,8 +15,8 @@ "dependencies": { "nativescript-camera": "../src", "nativescript-theme-core": "~1.0.4", - "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", @@ -30,11 +30,11 @@ "mocha-multi": "^1.0.1", "mochawesome": "^3.1.1", "nativescript-dev-appium": "~5.2.0", - "nativescript-dev-typescript": "~0.10.0", - "nativescript-dev-webpack": "~0.24.0", - "nativescript-vue-template-compiler": "~2.2.0", - "node-sass": "~4.9.0", + "nativescript-dev-webpack": "~1.0.1", + "nativescript-vue-template-compiler": "~2.3.0", + "node-sass": "~4.12.0", "tslint": "~5.12.1", - "vue-loader": "~15.4.0" + "vue-loader": "~15.4.0", + "typescript": "~3.4.5" } } diff --git a/demo/package.json b/demo/package.json index bf9b803..1d0c69a 100644 --- a/demo/package.json +++ b/demo/package.json @@ -6,10 +6,10 @@ "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" } }, "scripts": { @@ -23,7 +23,7 @@ }, "dependencies": { "nativescript-camera": "../src", - "tns-core-modules": "^5.0.0" + "tns-core-modules": "^6.0.0" }, "devDependencies": { "@types/chai": "~4.1.7", @@ -35,9 +35,9 @@ "mochawesome": "^3.1.1", "nativescript-css-loader": "~0.26.1", "nativescript-dev-appium": "~5.2.0", - "nativescript-dev-typescript": "~0.10.0", - "nativescript-dev-webpack": "~0.24.0", - "tns-platform-declarations": "^5.0.0", - "tslint": "~5.11.0" + "nativescript-dev-webpack": "~1.0.1", + "tns-platform-declarations": "^6.0.0", + "tslint": "~5.11.0", + "typescript": "~3.4.5" } } diff --git a/src/package.json b/src/package.json index 658b7fe..9bc3b4a 100644 --- a/src/package.json +++ b/src/package.json @@ -23,10 +23,10 @@ "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\"", "plugin.link": "npm link && cd ../demo && npm link nativescript-camera", "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.ng.ios": "npm i && npm run tsc && cd ../demo-angular && tns run ios --syncAllFiles", - "demo.ng.android": "npm i && npm run tsc && cd ../demo-angular && 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", + "demo.ng.ios": "npm i && npm run tsc && cd ../demo-angular && tns run ios", + "demo.ng.android": "npm i && npm run tsc && cd ../demo-angular && tns run android", "demo.reset": "cd ../demo && rimraf platforms", "plugin.prepare": "npm run tsc && cd ../demo && tns plugin remove nativescript-camera && tns plugin add ../src", "clean": "cd ../demo && rimraf hooks node_modules platforms && cd ../src && rimraf node_modules && npm run plugin.link",