Skip to content

Commit c7e5c1b

Browse files
DimitarTodorovDimitarTodorov
authored
Merge branch 'master' into dtodorov/add-ui-tests
2 parents c27cd22 + fe64410 commit c7e5c1b

File tree

9 files changed

+104
-121
lines changed

9 files changed

+104
-121
lines changed

‎.travis.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,20 @@ android:
187187
- android-28
188188
- extra-android-m2repository
189189

190+
before_cache:
191+
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
192+
193+
cache:
194+
directories:
195+
- .nvm
196+
- $HOME/.gradle/caches/
197+
- $HOME/.gradle/wrapper/
198+
190199
before_install:
191-
- sudo pip install --upgrade pip
192-
- sudo pip install six
200+
- sudo pip install --upgrade pip
201+
- sudo pip install six
193202

194203
install:
195-
- echo no | npm install -g nativescript
196-
- tns usage-reporting disable
197-
- tns error-reporting disable
204+
- echo no | npm install -g nativescript
205+
- tns usage-reporting disable
206+
- tns error-reporting disable

‎demo-angular/package.json

Lines changed: 53 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,57 @@
11
{
2-
"nativescript": {
3-
"id": "org.nativescript.datetimepicker.demong",
4-
"tns-android": {
5-
"version": "5.1.0"
2+
"nativescript": {
3+
"id": "org.nativescript.datetimepicker.demong",
4+
"tns-android": {
5+
"version": "5.2.0"
6+
},
7+
"tns-ios": {
8+
"version": "5.2.0"
9+
}
610
},
7-
"tns-ios": {
8-
"version": "5.1.0"
11+
"description": "NativeScript DateTimePicker Demo NG",
12+
"license": "SEE LICENSE IN LICENSE FILE",
13+
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
14+
"scripts": {
15+
"ci.tslint": "npm i && tslint --config '../tslint.json' 'src/**/*.ts'",
16+
"build.plugin": "cd ../src && npm run build"
17+
},
18+
"dependencies": {
19+
"@angular/animations": "~7.2.0",
20+
"@angular/common": "~7.2.0",
21+
"@angular/compiler": "~7.2.0",
22+
"@angular/core": "~7.2.0",
23+
"@angular/forms": "~7.2.0",
24+
"@angular/http": "~7.2.0",
25+
"@angular/platform-browser": "~7.2.0",
26+
"@angular/platform-browser-dynamic": "~7.2.0",
27+
"@angular/router": "~7.2.0",
28+
"nativescript-angular": "~7.2.1",
29+
"nativescript-datetimepicker": "file:../src",
30+
"nativescript-theme-core": "~1.0.4",
31+
"reflect-metadata": "~0.1.10",
32+
"rxjs": "~6.4.0",
33+
"tns-core-modules": "~5.2.0",
34+
"zone.js": "~0.8.18"
35+
},
36+
"devDependencies": {
37+
"@nativescript/schematics": "~0.5.0",
38+
"nativescript-dev-typescript": "~0.8.0",
39+
"nativescript-dev-webpack": "~0.20.0",
40+
"@angular/compiler-cli": "~7.2.0",
41+
"@ngtools/webpack": "~7.2.0",
42+
"@types/chai": "~4.1.7",
43+
"@types/mocha": "~5.2.5",
44+
"@types/node": "~10.12.18",
45+
"mocha": "~5.2.0",
46+
"mocha-junit-reporter": "~1.18.0",
47+
"mocha-multi": "~1.0.1",
48+
"mochawesome": "~3.1.1",
49+
"nativescript-dev-appium": "~5.0.0",
50+
"tslint": "~5.11.0"
51+
},
52+
"readme": "NativeScript DateTimePicker Demo NG"
53+
"scripts": {
54+
"e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js && tsc -p e2e && mocha --opts ./e2e/config/mocha.opts ",
55+
"e2e-watch": "tsc -p e2e --watch"
956
}
10-
},
11-
"description": "NativeScript DateTimePicker Demo NG",
12-
"license": "SEE LICENSE IN LICENSE FILE",
13-
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
14-
"dependencies": {
15-
"@angular/animations": "~7.1.0",
16-
"@angular/common": "~7.1.0",
17-
"@angular/compiler": "~7.1.0",
18-
"@angular/core": "~7.1.0",
19-
"@angular/forms": "~7.1.0",
20-
"@angular/http": "~7.1.0",
21-
"@angular/platform-browser": "~7.1.0",
22-
"@angular/platform-browser-dynamic": "~7.1.0",
23-
"@angular/router": "~7.1.0",
24-
"nativescript-angular": "~7.1.0",
25-
"nativescript-datetimepicker": "file:../publish/package/nativescript-datetimepicker-1.0.0.tgz",
26-
"nativescript-theme-core": "~1.0.4",
27-
"reflect-metadata": "~0.1.10",
28-
"rxjs": "~6.3.0",
29-
"tns-core-modules": "~5.1.0",
30-
"zone.js": "~0.8.18"
31-
},
32-
"devDependencies": {
33-
"@angular/compiler-cli": "~7.1.0",
34-
"@nativescript/schematics": "~0.5.0",
35-
"@ngtools/webpack": "~7.1.0",
36-
"@types/chai": "~4.1.7",
37-
"@types/mocha": "~5.2.5",
38-
"@types/node": "~10.12.18",
39-
"mocha": "~5.2.0",
40-
"mocha-junit-reporter": "~1.18.0",
41-
"mocha-multi": "~1.0.1",
42-
"mochawesome": "~3.1.1",
43-
"nativescript-dev-appium": "~5.0.0",
44-
"nativescript-dev-typescript": "~0.7.0",
45-
"nativescript-dev-webpack": "~0.19.0"
46-
},
47-
"readme": "NativeScript DateTimePicker Demo NG",
48-
"scripts": {
49-
"e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js && tsc -p e2e && mocha --opts ./e2e/config/mocha.opts ",
50-
"e2e-watch": "tsc -p e2e --watch"
51-
}
5257
}

‎demo-vue/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.datetimepicker.demovue",
44
"tns-android": {
5-
"version": "5.1.0"
5+
"version": "5.2.0"
66
},
77
"tns-ios": {
8-
"version": "5.1.0"
8+
"version": "5.2.0"
99
}
1010
},
1111
"description": "NativeScript DateTimePicker Demo Vue",
@@ -15,15 +15,15 @@
1515
"nativescript-datetimepicker": "file:../src",
1616
"nativescript-theme-core": "~1.0.4",
1717
"nativescript-vue": "~2.0.0",
18-
"tns-core-modules": "~5.1.0"
18+
"tns-core-modules": "~5.2.0"
1919
},
2020
"devDependencies": {
21-
"@babel/core": "~7.1.0",
22-
"@babel/preset-env": "~7.1.0",
21+
"@babel/core": "~7.2.0",
22+
"@babel/preset-env": "~7.2.0",
2323
"babel-loader": "~8.0.0",
24-
"nativescript-dev-typescript": "~0.7.0",
25-
"nativescript-dev-webpack": "~0.19.0",
26-
"nativescript-vue-template-compiler": "~2.0.0",
24+
"nativescript-dev-typescript": "~0.8.0",
25+
"nativescript-dev-webpack": "~0.20.0",
26+
"nativescript-vue-template-compiler": "~2.0.2",
2727
"node-sass": "~4.9.0",
2828
"vue-loader": "~15.4.0"
2929
},

‎demo/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"nativescript": {
33
"id": "org.nativescript.datetimepicker.demo",
44
"tns-android": {
5-
"version": "5.1.0"
5+
"version": "5.2.0"
66
},
77
"tns-ios": {
8-
"version": "5.1.0"
8+
"version": "5.2.0"
99
}
1010
},
1111
"description": "NativeScript DateTimePicker Demo Core",
12-
"license": "SEE LICENSE IN LINCENSE",
12+
"license": "SEE LICENSE IN LICENSE",
1313
"repository": "https://github.com/NativeScript/nativescript-datetimepicker",
1414
"scripts": {
1515
"ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts'",
@@ -18,11 +18,11 @@
1818
"dependencies": {
1919
"nativescript-datetimepicker": "file:../src",
2020
"nativescript-theme-core": "~1.0.4",
21-
"tns-core-modules": "~5.1.0"
21+
"tns-core-modules": "~5.2.0"
2222
},
2323
"devDependencies": {
24-
"nativescript-dev-typescript": "~0.7.0",
25-
"nativescript-dev-webpack": "~0.19.0",
24+
"nativescript-dev-typescript": "~0.8.0",
25+
"nativescript-dev-webpack": "~0.20.0",
2626
"tslint": "~5.11.0"
2727
},
2828
"readme": "NativeScript DateTimePicker Demo Core"

‎src/datetimepicker.common.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ function getColorsForClassName(view: View, className: string): { color: Color, b
110110
tempView[vueKey] = view[vueKey];
111111
}
112112
if (view.className) {
113-
tempView.cssClasses.add(view.className);
113+
let classNames = view.className.split(' ');
114+
classNames.forEach(element => {
115+
tempView.cssClasses.add(element);
116+
});
114117
}
115118
if (className) {
116119
tempView.cssClasses.add(className);

‎src/package.json

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"scripts": {
1313
"tsc": "npm i && tsc",
1414
"build": "npm run tsc",
15-
"build.native": "node scripts/build-native.js",
1615
"tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude \"**/platforms/**\"",
1716
"plugin.tscwatch": "npm run tsc -- -w",
1817
"demo.ios": "npm run build && cd ../demo && tns run ios --syncAllFiles --emulator",
@@ -28,7 +27,7 @@
2827
"clean": "npm run demo.reset && npx rimraf -- node_modules package-lock.json && npm i",
2928
"ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**'",
3029
"ngc": "ngc -p tsconfig.json",
31-
"prepack": "npm i && npm run ngc && npm run build.native",
30+
"prepack": "npm i && npm run ngc",
3231
"pack": "bash ../publish/pack.sh"
3332
},
3433
"keywords": [
@@ -48,23 +47,33 @@
4847
"bugs": {
4948
"url": "https://github.com/NativeScript/nativescript-datetimepicker/issues"
5049
},
50+
"repository": {
51+
"type": "git",
52+
"url": "git://github.com/NativeScript/nativescript-datetimepicker.git"
53+
},
5154
"license": "Apache-2.0",
5255
"homepage": "https://github.com/NativeScript/nativescript-datetimepicker",
5356
"readmeFilename": "README.md",
5457
"devDependencies": {
55-
"tns-core-modules": "^5.1.0",
56-
"tns-platform-declarations": "^5.1.0",
58+
"tns-core-modules": "^5.2.0",
59+
"tns-platform-declarations": "^5.2.0",
5760
"typescript": "~3.1.6",
5861
"prompt": "^1.0.0",
5962
"rimraf": "^2.6.2",
6063
"tslint": "^5.11.0",
6164
"semver": "^5.6.0",
62-
"nativescript-angular": "~7.1.0",
63-
"@angular/core": "~7.1.0",
64-
"@angular/common": "~7.1.0",
65-
"@angular/compiler": "~7.1.0",
66-
"@angular/compiler-cli": "~7.1.0",
67-
"@angular/forms": "~7.1.0",
65+
"nativescript-angular": "~7.2.1",
66+
"@angular/core": "~7.2.0",
67+
"@angular/common": "~7.2.0",
68+
"@angular/compiler": "~7.2.0",
69+
"@angular/compiler-cli": "~7.2.0",
70+
"@angular/forms": "~7.2.0",
71+
"@angular/http": "~7.2.0",
72+
"@angular/platform-browser": "~7.2.0",
73+
"@angular/platform-browser-dynamic": "~7.2.0",
74+
"@angular/router": "~7.2.0",
75+
"rxjs": "~6.4.0",
76+
"zone.js": "~0.8.26",
6877
"nativescript-vue": "~2.0.0"
6978
},
7079
"dependencies": {},

‎src/platforms/android/AndroidManifest.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/platforms/android/include.gradle

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/scripts/build-native.js

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)