Merge branch 'main' into chore/RMET-4220/app-minor-fixes

Author: OS-pedrogustavobilro

.github/workflows/release-from-prerelease.yml

@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   deploy-npm-latest-from-pre:
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

.github/workflows/reusable_lint-packages.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   lint:
-    runs-on: 'macos-14'
+    runs-on: 'macos-15'
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

.github/workflows/reusable_setup.yml

@@ -10,7 +10,7 @@ jobs:
   setup:
     strategy:
       matrix:
-        os: ['ubuntu-22.04', 'macos-14']
+        os: ['ubuntu-22.04', 'macos-15']
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     steps:

.github/workflows/reusable_verify-packages.yml

@@ -9,12 +9,12 @@ on:
 jobs:
 
   verify-ios:
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 30
     strategy:
       matrix:
         xcode:
-        - /Applications/Xcode_15.0.app
+        - /Applications/Xcode_16.4.app
     steps:
       - uses: actions/checkout@v3
         with:

plugin/.gitignore

@@ -60,3 +60,12 @@ captures
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 *.tgz
+
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
+Package.resolved
+/.build

plugin/CapacitorGoogleMaps.podspec

@@ -7,10 +7,10 @@ Pod::Spec.new do |s|
   s.version = package['version']
   s.summary = package['description']
   s.license = package['license']
-  s.homepage = 'https://capacitorjs.com'
+  s.homepage = package['repository']['url']
   s.author = package['author']
-  s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] }
-  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}', 'google-maps/ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
+  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
   s.dependency 'GoogleMaps', '~> 8.4'

plugin/Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "CapacitorGoogleMaps",
+    platforms: [.iOS(.v14)],
+    products: [
+        .library(
+            name: "CapacitorGoogleMaps",
+            targets: ["CapacitorGoogleMapsPlugin"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
+        .package(url: "https://github.com/googlemaps/ios-maps-sdk.git", .upToNextMajor(from:"8.4.0")),
+        .package(url: "https://github.com/googlemaps/google-maps-ios-utils.git", .upToNextMajor(from:"5.0.0"))
+    ],
+    targets: [
+        .target(
+            name: "CapacitorGoogleMapsPlugin",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm"),
+                .product(name: "GoogleMaps", package: "ios-maps-sdk"),
+                .product(name: "GoogleMapsUtils", package: "google-maps-ios-utils")
+            ],
+            path: "ios/Sources/CapacitorGoogleMapsPlugin"),
+        .testTarget(
+            name: "CapacitorGoogleMapsPluginTests",
+            dependencies: ["CapacitorGoogleMapsPlugin"],
+            path: "ios/Tests/CapacitorGoogleMapsPluginTests")
+    ]
+)

plugin/ios/.gitignore

@@ -0,0 +1,9 @@
+
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
+.DS_Store
+.build