From a4c4b3d5b42854ebe6f3f215980d3cbb8d3b907a Mon Sep 17 00:00:00 2001 From: Dylan Llewellyn <46717769+herefishyfish@users.noreply.github.com> Date: Thu, 29 May 2025 12:59:30 +0800 Subject: [PATCH 1/5] refactor(google-maps-utils): remove demo component and update iOS Podfile dependency --- .../google-maps-utils.component.html | 8 -------- .../google-maps-utils.component.ts | 19 ------------------- .../plugin-demos/google-maps-utils.module.ts | 10 ---------- .../google-maps-utils/platforms/ios/Podfile | 2 +- 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 apps/demo-angular/src/plugin-demos/google-maps-utils.component.html delete mode 100644 apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts delete mode 100644 apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts diff --git a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.html b/apps/demo-angular/src/plugin-demos/google-maps-utils.component.html deleted file mode 100644 index 56634035..00000000 --- a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts b/apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts deleted file mode 100644 index 3ae88b2b..00000000 --- a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component, NgZone } from '@angular/core'; -import { DemoSharedGoogleMapsUtils } from '@demo/shared'; -import { } from '@nativescript/google-maps-utils'; - -@Component({ - selector: 'demo-google-maps-utils', - templateUrl: 'google-maps-utils.component.html', -}) -export class GoogleMapsUtilsComponent { - - demoShared: DemoSharedGoogleMapsUtils; - - constructor(private _ngZone: NgZone) {} - - ngOnInit() { - this.demoShared = new DemoSharedGoogleMapsUtils(); - } - -} \ No newline at end of file diff --git a/apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts b/apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts deleted file mode 100644 index 1a219672..00000000 --- a/apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core'; -import { NativeScriptCommonModule, NativeScriptRouterModule } from '@nativescript/angular'; -import { GoogleMapsUtilsComponent } from './google-maps-utils.component'; - -@NgModule({ - imports: [NativeScriptCommonModule, NativeScriptRouterModule.forChild([{ path: '', component: GoogleMapsUtilsComponent }])], - declarations: [GoogleMapsUtilsComponent], - schemas: [ NO_ERRORS_SCHEMA] -}) -export class GoogleMapsUtilsModule {} diff --git a/packages/google-maps-utils/platforms/ios/Podfile b/packages/google-maps-utils/platforms/ios/Podfile index beb91951..569a96da 100644 --- a/packages/google-maps-utils/platforms/ios/Podfile +++ b/packages/google-maps-utils/platforms/ios/Podfile @@ -1 +1 @@ -pod 'Google-Maps-iOS-Utils', '4.1.0' +pod 'Google-Maps-iOS-Utils', '6.1.0' From bc70f92c9568e564b678e702616d0e067b362172 Mon Sep 17 00:00:00 2001 From: Dylan Llewellyn <46717769+herefishyfish@users.noreply.github.com> Date: Thu, 29 May 2025 13:14:18 +0800 Subject: [PATCH 2/5] refactor(google-maps-utils): update executor references from @nrwl to @nx --- packages/google-maps-utils/project.json | 132 +++++++++++------------- 1 file changed, 62 insertions(+), 70 deletions(-) diff --git a/packages/google-maps-utils/project.json b/packages/google-maps-utils/project.json index a27a83ab..b5b9cd59 100644 --- a/packages/google-maps-utils/project.json +++ b/packages/google-maps-utils/project.json @@ -1,72 +1,64 @@ { - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "projectType": "library", - "sourceRoot": "packages/google-maps-utils", - "targets": { - "build": { - "executor": "@nrwl/js:tsc", - "options": { - "outputPath": "dist/packages/google-maps-utils", - "tsConfig": "packages/google-maps-utils/tsconfig.json", - "packageJson": "packages/google-maps-utils/package.json", - "main": "packages/google-maps-utils/index.d.ts", - "assets": [ - "packages/google-maps-utils/*.md", - "packages/google-maps-utils/index.d.ts", - "LICENSE", - { - "glob": "**/*", - "input": "packages/google-maps-utils/platforms/", - "output": "./platforms/" - } - ], - "dependsOn": [ - { - "target": "build.all", - "projects": "dependencies" - } - ] - } - }, - "build.all": { - "executor": "@nrwl/workspace:run-commands", - "options": { - "commands": [ - "node tools/scripts/build-finish.ts google-maps-utils" - ], - "parallel": false - }, - "outputs": [ - "dist/packages/google-maps-utils" - ], - "dependsOn": [ - { - "target": "build.all", - "projects": "dependencies" - }, - { - "target": "build", - "projects": "self" - } - ] - }, - "focus": { - "executor": "@nrwl/workspace:run-commands", - "options": { - "commands": [ - "nx g @nativescript/plugin-tools:focus-packages google-maps-utils,google-maps" - ], - "parallel": false - } - }, - "lint": { - "executor": "@nrwl/linter:eslint", - "options": { - "lintFilePatterns": [ - "packages/google-maps-utils/**/*.ts" - ] - } - } - }, - "tags": [] + "$schema": "../../node_modules/nx/schemas/project-schema.json", + "projectType": "library", + "sourceRoot": "packages/google-maps-utils", + "targets": { + "build": { + "executor": "@nx/js:tsc", + "options": { + "outputPath": "dist/packages/google-maps-utils", + "tsConfig": "packages/google-maps-utils/tsconfig.json", + "packageJson": "packages/google-maps-utils/package.json", + "main": "packages/google-maps-utils/index.d.ts", + "assets": [ + "packages/google-maps-utils/*.md", + "packages/google-maps-utils/index.d.ts", + "LICENSE", + { + "glob": "**/*", + "input": "packages/google-maps-utils/platforms/", + "output": "./platforms/" + } + ], + "dependsOn": [ + { + "target": "build.all", + "projects": "dependencies" + } + ] + } + }, + "build.all": { + "executor": "@nx/workspace:run-commands", + "options": { + "commands": ["node tools/scripts/build-finish.ts google-maps-utils"], + "parallel": false + }, + "outputs": ["dist/packages/google-maps-utils"], + "dependsOn": [ + { + "target": "build.all", + "projects": "dependencies" + }, + { + "target": "build", + "projects": "self" + } + ] + }, + "focus": { + "executor": "@nx/workspace:run-commands", + "options": { + "commands": ["nx g @nativescript/plugin-tools:focus-packages google-maps-utils,google-maps"], + "parallel": false + } + }, + "lint": { + "executor": "@nx/linter:eslint", + "options": { + "lintFilePatterns": ["packages/google-maps-utils/**/*.ts"] + } + } + }, + "tags": [] } From b156e3fb528424c34443030a1b26d36c4905c796 Mon Sep 17 00:00:00 2001 From: Dylan Llewellyn <46717769+herefishyfish@users.noreply.github.com> Date: Thu, 29 May 2025 13:22:35 +0800 Subject: [PATCH 3/5] refactor(google-maps-utils): update project configuration and dependencies --- .vscode/settings.json | 8 ++++-- apps/demo/package.json | 9 ++++--- apps/demo/tsconfig.json | 4 ++- packages/google-maps-utils/project.json | 36 +++++++++++-------------- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index cfa6e103..87d5206d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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, @@ -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 } } diff --git a/apps/demo/package.json b/apps/demo/package.json index 17107122..c4a033b9 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -5,10 +5,9 @@ "repository": "", "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", @@ -16,6 +15,7 @@ "@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", @@ -26,6 +26,7 @@ "@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", @@ -33,6 +34,7 @@ "@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", @@ -40,8 +42,7 @@ "@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", diff --git a/apps/demo/tsconfig.json b/apps/demo/tsconfig.json index 69675d5d..0f673b41 100644 --- a/apps/demo/tsconfig.json +++ b/apps/demo/tsconfig.json @@ -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"] } } } diff --git a/packages/google-maps-utils/project.json b/packages/google-maps-utils/project.json index b5b9cd59..98b00a62 100644 --- a/packages/google-maps-utils/project.json +++ b/packages/google-maps-utils/project.json @@ -1,4 +1,5 @@ { + "name": "google-maps-utils", "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "library", "sourceRoot": "packages/google-maps-utils", @@ -19,46 +20,41 @@ "input": "packages/google-maps-utils/platforms/", "output": "./platforms/" } - ], - "dependsOn": [ - { - "target": "build.all", - "projects": "dependencies" - } ] - } + }, + "dependsOn": [ + { + "target": "build.all", + "dependencies": true + } + ] }, "build.all": { - "executor": "@nx/workspace:run-commands", + "executor": "nx:run-commands", "options": { "commands": ["node tools/scripts/build-finish.ts google-maps-utils"], "parallel": false }, - "outputs": ["dist/packages/google-maps-utils"], + "outputs": ["{workspaceRoot}/dist/packages/google-maps-utils"], "dependsOn": [ { "target": "build.all", - "projects": "dependencies" + "dependencies": true }, { - "target": "build", - "projects": "self" + "target": "build" } ] }, "focus": { - "executor": "@nx/workspace:run-commands", + "executor": "nx:run-commands", "options": { - "commands": ["nx g @nativescript/plugin-tools:focus-packages google-maps-utils,google-maps"], + "commands": ["nx g @nativescript/plugin-tools:focus-packages google-maps,google-maps-utils"], "parallel": false } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["packages/google-maps-utils/**/*.ts"] - } + "executor": "@nx/eslint:lint" } - }, - "tags": [] + } } From 38075366e95c86f95d4f972bec4461b531712297 Mon Sep 17 00:00:00 2001 From: Dylan Llewellyn <46717769+herefishyfish@users.noreply.github.com> Date: Thu, 29 May 2025 14:14:33 +0800 Subject: [PATCH 4/5] chore(google-maps-utils): update ios heatmaps --- apps/demo/package.json | 1 - .../src/plugin-demos/google-maps-utils.xml | 2 +- packages/google-maps-utils/index.ios.ts | 4 +- .../typings/objc!GoogleMapsUtils.d.ts | 150 +++++++----------- .../google-maps-utils/utils/index.android.ts | 2 + packages/google-maps-utils/utils/index.ios.ts | 2 + tools/demo/google-maps-utils/index.ts | 4 - 7 files changed, 63 insertions(+), 102 deletions(-) diff --git a/apps/demo/package.json b/apps/demo/package.json index c4a033b9..4eba42cb 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -5,7 +5,6 @@ "repository": "", "dependencies": { "@nativescript/google-maps": "file:../../packages/google-maps", - "@nativescript/jetpack-compose": "file:../../packages/jetpack-compose", "@nativescript/core": "*", "@nativescript/google-maps-utils": "file:../../packages/google-maps-utils", "@nativescript/animated-circle": "file:../../packages/animated-circle", diff --git a/apps/demo/src/plugin-demos/google-maps-utils.xml b/apps/demo/src/plugin-demos/google-maps-utils.xml index 65a33ef6..0d297ac0 100644 --- a/apps/demo/src/plugin-demos/google-maps-utils.xml +++ b/apps/demo/src/plugin-demos/google-maps-utils.xml @@ -3,7 +3,7 @@ - +