Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
"**/packages/social-share": false,
"**/packages/theme-switcher": false,
"**/packages/twitter": false,
"**/packages/zip": false
"**/packages/zip": false,
"**/packages/google-maps-utils": false,
"**/packages/google-mobile-ads": false
},
"search.exclude": {
"**/apps/demo": false,
Expand Down Expand Up @@ -77,6 +79,8 @@
"**/packages/social-share": false,
"**/packages/theme-switcher": false,
"**/packages/twitter": false,
"**/packages/zip": false
"**/packages/zip": false,
"**/packages/google-maps-utils": false,
"**/packages/google-mobile-ads": false
}
}

This file was deleted.

19 changes: 0 additions & 19 deletions apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts

This file was deleted.

10 changes: 0 additions & 10 deletions apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts

This file was deleted.

10 changes: 5 additions & 5 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
"repository": "<fill-your-repository-here>",
"dependencies": {
"@nativescript/google-maps": "file:../../packages/google-maps",
"@nativescript/google-maps-utils": "file:../../packages/google-maps-utils",
"@nativescript/jetpack-compose": "file:../../packages/jetpack-compose",
"@nativescript/core": "*",
"@nativescript/camera": "file:../../packages/camera",
"@nativescript/google-maps-utils": "file:../../packages/google-maps-utils",
"@nativescript/animated-circle": "file:../../packages/animated-circle",
"@nativescript/appavailability": "file:../../packages/appavailability",
"@nativescript/apple-sign-in": "file:../../packages/apple-sign-in",
"@nativescript/auto-fit-text": "file:../../packages/auto-fit-text",
"@nativescript/background-http": "file:../../packages/background-http",
"@nativescript/biometrics": "file:../../packages/biometrics",
"@nativescript/brightness": "file:../../packages/brightness",
"@nativescript/camera": "file:../../packages/camera",
"@nativescript/contacts": "file:../../packages/contacts",
"@nativescript/datetimepicker": "file:../../packages/datetimepicker",
"@nativescript/debug-android": "file:../../packages/debug-android",
Expand All @@ -26,22 +25,23 @@
"@nativescript/facebook": "file:../../packages/facebook",
"@nativescript/fingerprint-auth": "file:../../packages/fingerprint-auth",
"@nativescript/geolocation": "file:../../packages/geolocation",
"@nativescript/google-mobile-ads": "file:../../packages/google-mobile-ads",
"@nativescript/google-signin": "file:../../packages/google-signin",
"@nativescript/haptics": "file:../../packages/haptics",
"@nativescript/imagepicker": "file:../../packages/imagepicker",
"@nativescript/ios-security": "file:../../packages/ios-security",
"@nativescript/iqkeyboardmanager": "file:../../packages/iqkeyboardmanager",
"@nativescript/keyboard-toolbar": "file:../../packages/keyboard-toolbar",
"@nativescript/local-notifications": "file:../../packages/local-notifications",
"@nativescript/localize": "file:../../packages/localize",
"@nativescript/pdf": "file:../../packages/pdf",
"@nativescript/picker": "file:../../packages/picker",
"@nativescript/secure-storage": "file:../../packages/secure-storage",
"@nativescript/shared-notification-delegate": "file:../../packages/shared-notification-delegate",
"@nativescript/social-share": "file:../../packages/social-share",
"@nativescript/theme-switcher": "file:../../packages/theme-switcher",
"@nativescript/twitter": "file:../../packages/twitter",
"@nativescript/zip": "file:../../packages/zip",
"@nativescript/google-mobile-ads": "file:../../packages/google-mobile-ads"
"@nativescript/zip": "file:../../packages/zip"
},
"devDependencies": {
"@nativescript/android": "~8.9.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/plugin-demos/google-maps-utils.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ActionBar title="google-maps-utils" icon="" class="action-bar">
</ActionBar>
</Page.actionBar>
<StackLayout class="p-20">
<StackLayout class="p-1">
<StackLayout>
<Button text="Test google-maps-utils" tap="{{ testIt }}" class="btn btn-primary"/>
<map:MapView
Expand Down
4 changes: 3 additions & 1 deletion apps/demo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
"@nativescript/contacts": ["../../packages/contacts/index.d.ts"],
"@nativescript/*": ["../../packages/*"],
"@nativescript/google-mobile-ads": ["../../packages/google-mobile-ads/index.d.ts"],
"@nativescript/google-mobile-ads/angular": ["../../packages/google-mobile-ads/angular/index.ts"]
"@nativescript/google-mobile-ads/angular": ["../../packages/google-mobile-ads/angular/index.ts"],
"@nativescript/google-maps-utils": ["../../packages/google-maps-utils/index.d.ts"],
"@nativescript/keyboard-toolbar": ["../../packages/keyboard-toolbar/index.d.ts"]
}
}
}
3 changes: 2 additions & 1 deletion packages/google-maps-utils/index.ios.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Color, encoding } from '@nativescript/core';
import { GeoJSON } from 'geojson';
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions, intoNativeMarkerOptions } from '@nativescript/google-maps';
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions } from '@nativescript/google-maps';
import { intoNativeMarkerOptions } from '@nativescript/google-maps/utils';
import { HeatmapOptions, IClusterManager, IFeature, IGeoJsonLayer, IGeometry, IGeometryStyle, IGradient, IHeatmapTileProvider, intoNativeClusterManager, intoNativeHeatmapGradient, intoNativeHeatmapProvider } from '.';
import { applyMixins } from './utils/common';

Expand Down
2 changes: 1 addition & 1 deletion packages/google-maps-utils/platforms/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pod 'Google-Maps-iOS-Utils', '4.1.0'
pod 'Google-Maps-iOS-Utils', '6.1.0'
27 changes: 11 additions & 16 deletions packages/google-maps-utils/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
"input": "packages/google-maps-utils/platforms/",
"output": "./platforms/"
}
],
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
}
]
}
},
"dependsOn": [
{
"target": "build.all",
"dependencies": true
}
]
},
"build.all": {
"executor": "nx:run-commands",
Expand All @@ -41,11 +41,10 @@
"dependsOn": [
{
"target": "build.all",
"projects": "dependencies"
"dependencies": true
},
{
"target": "build",
"projects": "self"
"target": "build"
}
]
},
Expand All @@ -57,11 +56,7 @@
}
},
"lint": {
"executor": "@nx/eslint:eslint",
"options": {
"lintFilePatterns": ["packages/google-maps-utils/**/*.ts"]
}
"executor": "@nx/eslint:lint"
}
},
"tags": []
}
}
Loading