Skip to content

Commit 1eccccf

Browse files
fix: Remove custom main-activity
chore: Update to latest versions of packages chore: Update tsconfig
1 parent cfc42f8 commit 1eccccf

File tree

7 files changed

+34
-81
lines changed

7 files changed

+34
-81
lines changed

sdkAngular/app/App_Resources/Android/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
android:icon="@drawable/icon"
2525
android:label="@string/app_name"
2626
android:theme="@style/AppTheme" >
27-
27+
2828
<activity
29-
android:name="org.nativescript.sdkAngular.MainActivity"
29+
android:name="com.tns.NativeScriptActivity"
3030
android:label="@string/title_activity_kimera"
3131
android:configChanges="keyboardHidden|orientation|screenSize"
3232
android:theme="@style/LaunchScreenTheme">

sdkAngular/app/app.module.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { NativeScriptModule } from "nativescript-angular/nativescript.module";
22

33
// >> using-global-directives
44
// --- The built-in 'nativescript-pro-ui' modules, if you are not using 'lazy' loading, uncomment and import the below modules into the 'imports' of the first ngModule (AppModule) of the app.
5-
// import { NativeScriptUIListViewModule } from "nativescript-ui-listview/angular";
65
// import { NativeScriptUICalendarModule } from "nativescript-ui-calendar/angular";
76
// import { NativeScriptUIChartModule } from "nativescript-ui-chart/angular";
87
// import { NativeScriptUIDataFormModule } from "nativescript-ui-dataform/angular";

sdkAngular/app/main-activity.android.ts

-42
This file was deleted.

sdkAngular/app/main.ts

-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@ import { platformNativeScriptDynamic } from "nativescript-angular/platform";
22
import { AppModule } from "./app.module";
33
import * as application from "tns-core-modules/application";
44

5-
if (application.android) {
6-
require("./main-activity.android.ts");
7-
}
8-
95
platformNativeScriptDynamic().bootstrapModule(AppModule);

sdkAngular/package.json

+29-28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-telerik-ui-sdk-angular-examples",
3-
"version": "3.0.0",
3+
"version": "4.0.0",
44
"description": "Nativescript project that demonstrates the Progress NativeScript UI suite with Angular",
55
"license": "SEE LICENSE IN <your-license-filename>",
66
"readme": "NativeScript Application",
@@ -18,18 +18,19 @@
1818
}
1919
},
2020
"dependencies": {
21-
"@angular/common": "^5.0.0",
22-
"@angular/compiler": "^5.0.0",
23-
"@angular/core": "^5.0.0",
24-
"@angular/forms": "^5.0.0",
25-
"@angular/http": "^5.0.0",
26-
"@angular/platform-browser": "^5.0.0",
27-
"@angular/platform-browser-dynamic": "^5.0.0",
28-
"@angular/router": "^5.0.0",
29-
"nativescript-angular": "5.3.0",
21+
"@angular/animations": "~5.2.0",
22+
"@angular/common": "~5.2.0",
23+
"@angular/compiler": "~5.2.0",
24+
"@angular/core": "~5.2.0",
25+
"@angular/forms": "~5.2.0",
26+
"@angular/http": "~5.2.0",
27+
"@angular/platform-browser": "~5.2.0",
28+
"@angular/platform-browser-dynamic": "~5.2.0",
29+
"@angular/router": "~5.2.0",
30+
"nativescript-angular": "~5.3.0",
3031
"nativescript-fresco": "^3.0.2",
3132
"nativescript-intl": "^3.0.0",
32-
"nativescript-theme-core": "^1.0.4",
33+
"nativescript-theme-core": "~1.0.4",
3334
"nativescript-ui-autocomplete": "^3.6.0",
3435
"nativescript-ui-calendar": "^3.5.0",
3536
"nativescript-ui-chart": "^3.5.0",
@@ -38,22 +39,28 @@
3839
"nativescript-ui-listview": "^3.5.0",
3940
"nativescript-ui-sidedrawer": "^4.0.0",
4041
"nativescript-unit-test-runner": "^0.3.2",
41-
"rxjs": "^5.5.2",
42+
"reflect-metadata": "~0.1.10",
43+
"rxjs": "~5.5.5",
4244
"tns-core-modules": "4.0.0",
43-
"zone.js": "~0.8.2"
45+
"zone.js": "~0.8.18"
4446
},
4547
"devDependencies": {
46-
"@angular/compiler-cli": "^5.0.0",
47-
"@ngtools/webpack": "~1.8.2",
48-
"babel-traverse": "6.24.1",
49-
"babel-types": "6.24.1",
50-
"babylon": "6.17.0",
51-
"chai": "^3.5.0",
48+
"@angular/compiler-cli": "~5.2.0",
49+
"@ngtools/webpack": "~1.9.4",
50+
"babel-traverse": "6.26.0",
51+
"babel-types": "6.26.0",
52+
"babylon": "6.18.0",
5253
"clean-webpack-plugin": "~0.1.19",
54+
"copy-webpack-plugin": "~4.3.0",
55+
"extract-text-webpack-plugin": "~3.0.2",
56+
"nativescript-dev-typescript": "~0.7.0",
57+
"resolve-url-loader": "~2.2.1",
58+
"typescript": "~2.7.2",
59+
"webpack": "~3.10.0",
60+
"webpack-bundle-analyzer": "^2.9.1",
61+
"webpack-sources": "~1.1.0",
5362
"codelyzer": "^3.0.0",
54-
"copy-webpack-plugin": "~4.0.1",
5563
"css-loader": "~0.28.7",
56-
"extract-text-webpack-plugin": "~3.0.0",
5764
"filewalker": "0.1.3",
5865
"karma": "^1.6.0",
5966
"karma-chai": "^0.1.0",
@@ -62,19 +69,13 @@
6269
"lazy": "1.0.11",
6370
"mocha": "^3.3.0",
6471
"nativescript-css-loader": "~0.26.0",
65-
"nativescript-dev-typescript": "0.5.1",
6672
"nativescript-dev-webpack": "^0.10.1",
6773
"nativescript-worker-loader": "~0.8.1",
6874
"raw-loader": "~0.5.1",
69-
"resolve-url-loader": "~2.1.0",
7075
"tns-platform-declarations": "3.4.0",
7176
"tslib": "1.7.1",
7277
"tslint": "^5.1.0",
73-
"typescript": "~2.4.2",
74-
"uglifyjs-webpack-plugin": "^1.1.6",
75-
"webpack": "~3.8.1",
76-
"webpack-bundle-analyzer": "^2.8.2",
77-
"webpack-sources": "~1.0.1"
78+
"uglifyjs-webpack-plugin": "^1.1.6"
7879
},
7980
"scripts": {
8081
"tslint": "tslint --project tsconfig.json --config tslint.json",

sdkAngular/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"*": [
2424
"./node_modules/tns-core-modules/*",
2525
"./node_modules/*"
26+
],
27+
"~/*": [
28+
"app/*"
2629
]
2730
}
2831
},
29-
"filesGlob": [
30-
"./**/*.ts"
31-
],
3232
"exclude": [
3333
"node_modules",
3434
"platforms"

sdkAngular/webpack.config.js

-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ module.exports = env => {
194194
const compress = platform !== "android";
195195
config.plugins.push(new UglifyJsPlugin({
196196
uglifyOptions: {
197-
mangle: { reserved: nsWebpack.uglifyMangleExcludes }, // Deprecated. Remove if using {N} 4+.
198197
compress,
199198
}
200199
}));

0 commit comments

Comments
 (0)