From 0ffac1ab9f46116d0fec0c16a592f05383e82380 Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Thu, 16 Jun 2016 13:08:10 +0300 Subject: [PATCH 1/2] Fix d.ts build check to not include android17/ios.dts --- gruntfile.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index 01f2c5d64..34491d161 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -419,7 +419,7 @@ module.exports = function(grunt) { }, buildDts: { src: [ - '**/*.d.ts', + 'tns-core-modules/**/*.d.ts', '!org.nativescript.widgets.d.ts', '!**/*.android.d.ts', '!node_modules/**/*', @@ -427,8 +427,9 @@ module.exports = function(grunt) { '!tests/platforms/**/*.*', '!bin/**/*', '!apps/**/*', - '!android17.d.ts', - '!ios.d.ts', + '!tns-core-modules/android17.d.ts', + '!tns-core-modules/ios.d.ts', + '!tns-core-modules/org.nativescript.widgets.d.ts', ], outDir: localCfg.outDir, dest: localCfg.outDir, From 1a88cf0e8c8aa096fa8a43f30775f17d0d996bd3 Mon Sep 17 00:00:00 2001 From: Hristo Deshev Date: Thu, 16 Jun 2016 13:08:32 +0300 Subject: [PATCH 2/2] Fix frame.d.ts to not expose public android types. --- tns-core-modules/ui/frame/frame.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tns-core-modules/ui/frame/frame.d.ts b/tns-core-modules/ui/frame/frame.d.ts index f9955b7a3..0c5bf36f5 100644 --- a/tns-core-modules/ui/frame/frame.d.ts +++ b/tns-core-modules/ui/frame/frame.d.ts @@ -351,7 +351,7 @@ declare module "ui/frame" { //@private function reloadPage(): void; function resolvePageFromEntry(entry: NavigationEntry): pages.Page; - function setFragmentCallbacks(fragment: android.app.Fragment): void; - function setActivityCallbacks(activity: android.app.Activity): void; + function setFragmentCallbacks(fragment: any /*android.app.Fragment*/): void; + function setActivityCallbacks(activity: any /*android.app.Activity*/): void; //@endprivate -} \ No newline at end of file +}