Skip to content

Commit dd129b0

Browse files
committed
update to TNS 4
1 parent 7cfdbf4 commit dd129b0

20 files changed

+9422
-221
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ $RECYCLE.BIN/
4141
Network Trash Folder
4242
Temporary Items
4343
.apdisk
44+
.tmp_backup
4445

4546
bin
4647
obj

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android:
44
components:
55
- tools
66
- platform-tools
7-
- build-tools-25.0.2
7+
- build-tools-26.0.2
88
- android-23
99
- android-25
1010
- extra-android-m2repository
@@ -58,7 +58,7 @@ matrix:
5858
language: android
5959
os: linux
6060
env:
61-
- Android="25"
61+
- Android="26"
6262
- Platform="Android"
6363
jdk: oraclejdk8
6464
before_install: nvm install 6.10.3

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
"bin/**": true
99
}
1010
,
11-
"typescript.tsdk": "./node_modules/typescript/lib"
11+
"typescript.tsdk": "./node_modules/typescript/lib",
12+
"git.ignoreLimitWarning": true
1213
}

demo-ng/.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99
"app/**/*.js": true,
1010
"app/**/*.map": true,
1111
"app/**/*.css": true
12-
}
12+
},
13+
"git.ignoreLimitWarning": true,
14+
"typescript.tsdk": "node_modules/typescript/lib"
1315
}

demo-ng/app/App_Resources/Android/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
<activity
2929
android:name="com.tns.NativeScriptActivity"
30-
android:label="@string/title_activity_kimera"
3130
android:configChanges="keyboardHidden|orientation|screenSize"
3231
android:theme="@style/LaunchScreenTheme">
3332

demo-ng/app/app.module.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
1+
import { NO_ERRORS_SCHEMA, NgModule } from "@angular/core";
22
import { NativeScriptModule } from "nativescript-angular/nativescript.module";
3-
import { AppRoutingModule } from "./app.routing";
43
import { AppComponent } from "./app.component";
4+
import { AppRoutingModule } from "./app.routing";
55

66
import { ItemService } from "./item/item.service";
7-
import { ItemsComponent } from "./item/items.component";
7+
88
import { ItemDetailComponent } from "./item/item-detail.component";
9+
import { ItemsComponent } from "./item/items.component";
910

1011
// Uncomment and add to NgModule imports if you need to use two-way binding
1112
// import { NativeScriptFormsModule } from "nativescript-angular/forms";
1213

1314
// Uncomment and add to NgModule imports if you need to use the HTTP wrapper
1415
// import { NativeScriptHttpModule } from "nativescript-angular/http";
1516

16-
import { GridViewModule } from 'nativescript-grid-view/angular';
17-
import * as trace from 'tns-core-modules/trace';
18-
trace.setCategories('ns-grid-view');
17+
import { GridViewModule } from "nativescript-grid-view/angular";
18+
import * as trace from "tns-core-modules/trace";
19+
trace.setCategories("ns-grid-view");
1920
// trace.enable();
2021

2122
@NgModule({

demo-ng/app/vendor.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@ require("@angular/router");
1818
require("nativescript-angular/platform-static");
1919
require("nativescript-angular/forms");
2020
require("nativescript-angular/router");
21-
22-
require("nativescript-grid-view"); // Added for snapshots

0 commit comments

Comments
 (0)