chore: cleanup utils packaging

apps/automated/src/ui/core/bindable/bindable-tests.ts

@@ -4,7 +4,6 @@ import { BindingOptions } from '@nativescript/core/ui/core/bindable';
 import * as TKUnit from '../../../tk-unit';
 import * as types from '@nativescript/core/utils/types';
 import * as helper from '../../../ui-helper';
-import * as utils from '@nativescript/core/utils/utils';
 import * as bindingBuilder from '@nativescript/core/ui/builder/binding-builder';
 import * as appModule from '@nativescript/core/application';
 import { Trace } from '@nativescript/core';

apps/automated/src/ui/label/label-tests.ts

@@ -7,7 +7,7 @@ import * as LabelModule from '@nativescript/core/ui/label';
 
 import * as types from '@nativescript/core/utils/types';
 import * as colorModule from '@nativescript/core/color';
-import * as utils from '@nativescript/core/utils/utils';
+import * as utils from '@nativescript/core/utils';
 import * as observableModule from '@nativescript/core/data/observable';
 import * as bindable from '@nativescript/core/ui/core/bindable';
 import { CoreTypes, Span, FormattedString } from '@nativescript/core';

apps/automated/src/ui/layouts/stack-layout-tests.ts

@@ -3,7 +3,7 @@ import { Button } from '@nativescript/core/ui/button';
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
 import { CoreTypes } from '@nativescript/core';
-import * as utils from '@nativescript/core/utils/utils';
+import * as utils from '@nativescript/core/utils';
 import * as testModule from '../../ui-test';
 import * as layoutHelper from './layout-helper';
 import * as commonTests from './common-layout-tests';

apps/automated/src/ui/placeholder/placeholder-tests.ts

@@ -1,7 +1,7 @@
 import * as TKUnit from '../../tk-unit';
 // >> article-creating-view
 import { isIOS, isAndroid } from '@nativescript/core/platform';
-import * as utils from '@nativescript/core/utils/utils';
+import * as utils from '@nativescript/core/utils';
 import * as helper from '../../ui-helper';
 import * as viewModule from '@nativescript/core/ui/core/view';
 

apps/automated/src/ui/search-bar/search-bar-tests-native.android.ts

@@ -1,6 +1,6 @@
 import * as colorModule from '@nativescript/core/color';
 import * as searchBarModule from '@nativescript/core/ui/search-bar';
-import * as utils from '@nativescript/core/utils/utils';
+import * as utils from '@nativescript/core/utils';
 
 function getTextView(bar: android.widget.SearchView): android.widget.TextView {
 	if (bar) {

apps/automated/src/ui/view/view-tests.ios.ts

@@ -4,7 +4,7 @@ import { GridLayout } from '@nativescript/core/ui/layouts/grid-layout';
 import { Color } from '@nativescript/core/color';
 import * as helper from '../../ui-helper';
 import * as TKUnit from '../../tk-unit';
-import * as utils from '@nativescript/core/utils/utils';
+import * as utils from '@nativescript/core/utils';
 
 export * from './view-tests-common';
 

apps/automated/src/utils/utils-tests.ts

@@ -1,5 +1,5 @@
 import * as TKUnit from '../tk-unit';
-import * as utils from '@nativescript/core/utils/utils';
+import * as utils from '@nativescript/core/utils';
 import { isIOS } from '@nativescript/core/platform';
 
 export function test_GC_isDefined() {

apps/ui/src/flexbox/flexbox-perf-comparison-page.ts

@@ -1,5 +1,5 @@
-import { TabView } from '@nativescript/core/ui/tab-view';
-import * as utils from '@nativescript/core/utils/utils';
+import { TabView } from '@nativescript/core';
+import * as utils from '@nativescript/core/utils';
 
 const titles = ['Etiam lacinia', 'Imperdiet ante', 'A interdum', 'Quisque tempus', 'Sodales viverra'];
 const bodies = [

apps/ui/src/issues/issue-2942-page.ts

@@ -1,5 +1,4 @@
-import { ad } from '@nativescript/core/utils/utils';
-import { isAndroid } from '@nativescript/core/platform';
+import { Utils } from '@nativescript/core';
 
 export function onButtonLoaded(args) {
 	if (args.object.android) {
@@ -14,7 +13,5 @@ export function onListViewLoaded(args) {
 }
 
 export function hideKeyboard() {
-	if (isAndroid) {
-		ad.dismissSoftInput();
-	}
+	Utils.dismissSoftInput();
 }

packages/core/file-system/file-system-access.android.ts

@@ -1,6 +1,6 @@
 import * as textModule from '../text';
 import { getNativeApplication } from '../application';
-import { SDK_VERSION } from '../utils/utils';
+import { SDK_VERSION } from '../utils';
 
 import type { IFileSystemAccess } from './file-system-access';
 

packages/core/utils/index.android.ts

@@ -1,12 +1,13 @@
 import { ad } from './native-helper';
-import { SDK_VERSION } from '../utils';
 import { FileSystemAccess } from '../file-system/file-system-access';
 import { Trace } from '../trace';
 
 export { ad, dataDeserialize, dataSerialize, iOSNativeHelper } from './native-helper';
-export * from './utils-common';
+export * from './common';
 export { Source } from './debug';
 
+export const SDK_VERSION = android.os.Build.VERSION.SDK_INT;
+
 const MIN_URI_SHARE_RESTRICTED_APK_VERSION = 24;
 
 export function GC() {

packages/core/utils/index.ios.ts

@@ -2,9 +2,11 @@ import { iOSNativeHelper } from './native-helper';
 import { Trace } from '../trace';
 
 export { dataDeserialize, dataSerialize, iOSNativeHelper } from './native-helper';
-export * from './utils-common';
+export * from './common';
 export { Source } from './debug';
 
+export const SDK_VERSION = parseFloat(UIDevice.currentDevice.systemVersion);
+
 export function openFile(filePath: string): boolean {
 	try {
 		const appPath = iOSNativeHelper.getCurrentAppPath();

packages/core/utils/utils.android.ts

@@ -1,7 +0,0 @@
-/**
- * A lot of plugins still used utils/utils
- * Left here for convenience (over time can eventually remove these)
- */
-export * from './index';
-
-export const SDK_VERSION = android.os.Build.VERSION.SDK_INT;

packages/core/utils/utils.d.ts

@@ -1 +0,0 @@
-export * from './index';

packages/core/utils/utils.ios.ts

@@ -1,7 +0,0 @@
-/**
- * A lot of plugins still used utils/utils
- * Left here for convenience (over time can eventually remove these)
- */
-export * from './index';
-
-export const SDK_VERSION = parseFloat(UIDevice.currentDevice.systemVersion);