10000 feat(google-map-utils): update ios sdk (#629) · Ombuweb/plugins@d1395b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit d1395b6

Browse files
herefishyfishherefishyfish
authored
feat(google-map-utils): update ios sdk (NativeScript#629)
1 parent c2b5c26 commit d1395b6

File tree

14 files changed

+88
-163
lines changed

14 files changed

+88
-163
lines changed

‎.vscode/settings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
"**/packages/social-share": false,
3838
"**/packages/theme-switcher": false,
3939
"**/packages/twitter": false,
40-
"**/packages/zip": false
40+
"**/packages/zip": false,
41+
"**/packages/google-maps-utils": false,
42+
"**/packages/google-mobile-ads": false
4143
},
4244
"search.exclude": {
4345
"**/apps/demo": false,
@@ -77,6 +79,8 @@
7779
"**/packages/social-share": false,
7880
"**/packages/theme-switcher": false,
7981
"**/packages/twitter": false,
80-
"**/packages/zip": false
82+
"**/packages/zip": false,
83+
"**/packages/google-maps-utils": false,
84+
"**/packages/google-mobile-ads": false
8185
}
8286
}

‎apps/demo-angular/src/plugin-demos/google-maps-utils.component.html

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎apps/demo/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
"repository": "<fill-your-repository-here>",
66
"dependencies": {
77
"@nativescript/google-maps": "file:../../packages/google-maps",
8-
"@nativescript/google-maps-utils": "file:../../packages/google-maps-utils",
9-
"@nativescript/jetpack-compose": "file:../../packages/jetpack-compose",
108
"@nativescript/core": "*",
11-
"@nativescript/camera": "file:../../packages/camera",
9+
"@nativescript/google-maps-utils": "file:../../packages/google-maps-utils",
1210
"@nativescript/animated-circle": "file:../../packages/animated-circle",
1311
"@nativescript/appavailability": "file:../../packages/appavailability",
1412
"@nativescript/apple-sign-in": "file:../../packages/apple-sign-in",
1513
"@nativescript/auto-fit-text": "file:../../packages/auto-fit-text",
1614
"@nativescript/background-http": "file:../../packages/background-http",
1715
"@nativescript/biometrics": "file:../../packages/biometrics",
1816
"@nativescript/brightness": "file:../../packages/brightness",
17+
"@nativescript/camera": "file:../../packages/camera",
1918
"@nativescript/contacts": "file:../../packages/contacts",
2019
"@nativescript/datetimepicker": "file:../../packages/datetimepicker",
2120
"@nativescript/debug-android": "file:../../packages/debug-android",
@@ -26,22 +25,23 @@
2625
"@nativescript/facebook": "file:../../packages/facebook",
2726
"@nativescript/fingerprint-auth": "file:../../packages/fingerprint-auth",
2827
"@nativescript/geolocation": "file:../../packages/geolocation",
28+
"@nativescript/google-mobile-ads": "file:../../packages/google-mobile-ads",
2929
"@nativescript/google-signin": "file:../../packages/google-signin",
3030
"@nativescript/haptics": "file:../../packages/haptics",
3131
"@nativescript/imagepicker": "file:../../packages/imagepicker",
3232
"@nativescript/ios-security": "file:../../packages/ios-security",
3333
"@nativescript/iqkeyboardmanager": "file:../../packages/iqkeyboardmanager",
3434
"@nativescript/keyboard-toolbar": "file:../../packages/keyboard-toolbar",
3535
"@nativescript/local-notifications": "file:../../packages/local-notifications",
36+
"@nativescript/localize": "file:../../packages/localize",
3637
"@nativescript/pdf": "file:../../packages/pdf",
3738
"@nativescript/picker": "file:../../packages/picker",
3839
"@nativescript/secure-storage": "file:../../packages/secure-storage",
3940
"@nativescript/shared-notification-delegate": "file:../../packages/shared-notification-delegate",
4041
"@nativescript/social-share": "file:../../packages/social-share",
4142
"@nativescript/theme-switcher": "file:../../packages/theme-switcher",
4243
"@nativescript/twitter": "file:../../packages/twitter",
43-
"@nativescript/zip": "file:../../packages/zip",
44-
"@nativescript/google-mobile-ads": "file:../../packages/google-mobile-ads"
44+
"@nativescript/zip": "file:../../packages/zip"
4545
},
4646
"devDependencies": {
4747
"@nativescript/android": "~8.9.0",

‎apps/demo/src/plugin-demos/google-maps-utils.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ActionBar title="google-maps-utils" icon="" class="action-bar">
44
</ActionBar>
55
</Page.actionBar>
6-
<StackLayout class="p-20">
6+
<StackLayout class="p-1">
77
<StackLayout>
88
<Button text="Test google-maps-utils" tap="{{ testIt }}" class="btn btn-primary"/>
99
<map:MapView

‎apps/demo/tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
"@nativescript/contacts": ["../../packages/contacts/index.d.ts"],
4949
"@nativescript/*": ["../../packages/*"],
5050
"@nativescript/google-mobile-ads": ["../../packages/google-mobile-ads/index.d.ts"],
51-
"@nativescript/google-mobile-ads/angular": ["../../packages/google-mobile-ads/angular/index.ts"]
51+
"@nativescript/google-mobile-ads/angular": ["../../packages/google-mobile-ads/angular/index.ts"],
52+
"@nativescript/google-maps-utils": ["../../packages/google-maps-utils/index.d.ts"],
53+
"@nativescript/keyboard-toolbar": ["../../packages/keyboard-toolbar/index.d.ts"]
5254
}
5355
}
5456
}

‎packages/google-maps-utils/index.ios.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Color, encoding } from '@nativescript/core';
22
import { GeoJSON } from 'geojson';
3-
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions, intoNativeMarkerOptions } from '@nativescript/google-maps';
3+
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions } from '@nativescript/google-maps';
4+
import { intoNativeMarkerOptions } from '@nativescript/google-maps/utils';
45
import { HeatmapOptions, IClusterManager, IFeature, IGeoJsonLayer, IGeometry, IGeometryStyle, IGradient, IHeatmapTileProvider, intoNativeClusterManager, intoNativeHeatmapGradient, intoNativeHeatmapProvider } from '.';
56
import { applyMixins } from './utils/common';
67

‎packages/google-maps-utils/platforms/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pod 'Google-Maps-iOS-Utils', '4.1.0'
1+
pod 'Google-Maps-iOS-Utils', '6.1.0'

‎packages/google-maps-utils/project.json

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
"input": "packages/google-maps-utils/platforms/",
2323
"output": "./platforms/"
2424
}
25-
],
26-
"dependsOn": [
27-
{
28-
"target": "build.all",
29-
"projects": "dependencies"
30-
}
3125
]
32-
}
26+
},
27+
"dependsOn": [
28+
{
29+
"target": "build.all",
30+
"dependencies": true
31+
}
32+
]
3333
},
3434
"build.all": {
3535
"executor": "nx:run-commands",
@@ -41,11 +41,10 @@
4141
"dependsOn": [
4242
{
4343
"target": "build.all",
44-
"projects": "dependencies"
44+
"dependencies": true
4545
},
4646
{
47-
"target": "build",
48-
"projects": "self"
47+
"target": "build"
4948
}
5049
]
5150
},
@@ -57,11 +56,7 @@
5756
}
5857
},
5958
"lint": {
60-
"executor": "@nx/eslint:eslint",
61-
"options": {
62-
"lintFilePatterns": ["packages/google-maps-utils/**/*.ts"]
63-
}
59+
"executor": "@nx/eslint:lint"
6460
}
65-
},
66-
"tags": []
61+
}
6762
}

0 commit comments

Comments
 (0)
0