chore: update main-swift branch from main branch (#522)

* feat(map): allow custom iconView on GMSMarker subclasses (#506)

Previously, when subclassing GMSMarker with a custom iconView, the iconView would not display on the map. This update enables custom iconViews to render correctly when using GMSMarker subclasses.

* chore(main): release 6.1.0 (#507)

* chore(main): release 6.1.0

* chore(release-please--branches--main): Patch to release branch 6.1.0 (#509)

---------

Co-authored-by: Subhodip Banerjee <[email protected]>

* chore: fixed broken URLs (#515)

* chore: update release-please-config.json (#517)

Formatting based on https://github.com/googleapis/release-please/blob/main/docs/manifest-releaser.md#configfile

* chore: update Simulator and iPhone version in `build.yml` file.

* chore: update simulator and iphone version

* chore: update xcode version.

* chore: Revert OS version.

* chore: Update iOS & iPhone Version, revert Xcode version.

* chore: Remove use of third party setup-xcode

---------

Co-authored-by: Talip BÖKE <[email protected]>
Co-authored-by: googlemaps-bot <[email protected]>
Co-authored-by: Enrique López Mañas <[email protected]>
Co-authored-by: Angela Yu <[email protected]>

Author: 5 people

.github/workflows/build.yml

@@ -38,24 +38,18 @@ jobs:
     - name: Checkout google-maps-ios-utils
       uses: actions/checkout@v4
 
-    # Specify the latest stable Xcode version, since the default for macos-latest might not meet SDK minimum Xcode requirements.
-    - name: Set Xcode version
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: latest-stable
-
     # For as long as this is a mixed-language library, swift build will not support the Obj-C part of the code so we must use xcodebuild.
     - name: Build and analyze Swift Package with xcodebuild
       run: |
         xcodebuild clean build analyze \
           -scheme GoogleMapsUtils -configuration Debug \
-          -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" \
+          -destination "platform=iOS Simulator,OS=18.1,name=iPhone 16" \
           -disableAutomaticPackageResolution | xcpretty
 
     - name: Run unit tests on Swift Package
       run: |
         xcodebuild test -scheme GoogleMapsUtils \
-          -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" \
+          -destination "platform=iOS Simulator,OS=18.1,name=iPhone 16" \
           -disableAutomaticPackageResolution
 
     - name: Upload test results to CodeCov
@@ -103,7 +97,7 @@ jobs:
       run: |
         xcodebuild -workspace samples/SwiftDemoApp/SwiftDemoApp.xcworkspace \
           -scheme SwiftDemoApp -configuration Debug \
-          -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" build | xcpretty
+          -destination "platform=iOS Simulator,OS=18.1,name=iPhone 16" build | xcpretty
 
   build_objc_sample:
     name: Build Objective-C Sample App with CocoaPods locally
@@ -124,7 +118,7 @@ jobs:
       run: |
         xcodebuild -workspace samples/ObjCDemoApp/ObjCDemoApp.xcworkspace \
           -scheme ObjCDemoApp -configuration Debug \
-          -destination "platform=iOS Simulator,OS=17.4,name=iPhone 15" build | xcpretty
+          -destination "platform=iOS Simulator,OS=18.1,name=iPhone 16" build | xcpretty
 
   test: # used as required status check
     runs-on: ubuntu-latest

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "6.0.0"
+  ".": "6.1.0"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [6.1.0](https://github.com/googlemaps/google-maps-ios-utils/compare/v6.0.0...v6.1.0) (2024-11-07)
+
+
+### Features
+
+* **map:** allow custom iconView on GMSMarker subclasses ([#506](https://github.com/googlemaps/google-maps-ios-utils/issues/506)) ([125dfe5](https://github.com/googlemaps/google-maps-ios-utils/commit/125dfe516b0ad4497889da1ec3b6e02a38174ae9))
+
 ## [6.0.0](https://github.com/googlemaps/google-maps-ios-utils/compare/v5.0.0...v6.0.0) (2024-07-31)
 
 

Google-Maps-iOS-Utils.podspec

@@ -3,7 +3,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Google-Maps-iOS-Utils"
-  s.version      = "6.0.0" # x-release-please-version
+  s.version      = "6.1.0" # x-release-please-version
   s.summary      = "A utilities library for use with Google Maps SDK for iOS."
   s.description  = "
                    This library contains classes that are useful for a wide range of applications

Podfile.template

@@ -5,6 +5,6 @@ platform :ios, '15.0'
 target 'YOUR_APPLICATION_TARGET_NAME_HERE' do
   use_frameworks!
   pod 'GoogleMaps', '9.0.0'
-  pod 'Google-Maps-iOS-Utils', '6.0.0' # x-release-please-version
+  pod 'Google-Maps-iOS-Utils', '6.1.0' # x-release-please-version
 end
 # [END maps_ios_utils_podfile_template]

README.md

@@ -70,7 +70,7 @@ range of applications using the [Google Maps SDK for iOS][sdk].
 
   target 'TARGET_NAME' do
     pod 'GoogleMaps', '9.0.0'
-    pod 'Google-Maps-iOS-Utils', '6.0.0'
+    pod 'Google-Maps-iOS-Utils', '6.1.0' # x-release-please-version
   end
   ```
 

Sources/GoogleMapsUtilsObjC/include/GMUDefaultClusterRenderer.m

@@ -284,7 +284,7 @@ - (void)renderCluster:(id<GMUCluster>)cluster animated:(BOOL)animated {
   } else {
     for (id<GMUClusterItem> item in cluster.items) {
       GMSMarker *marker;
-      if ([item class] == [GMSMarker class]) {
+      if ([item isKindOfClass:[GMSMarker class]]) {
         marker = (GMSMarker<GMUClusterItem> *)item;
         marker.map = _mapView;
       } else {

docs/GeometryUtils.md

@@ -4,8 +4,8 @@ Geometry Utilities
 The utility library contains Swift-friendly extensions of the [GMSGeometryUtils](https://developers.google.com/maps/documentation/ios-sdk/reference/group___geometry_utils) module of the Maps SDK for iOS. Rather than using C-Style functions in `GMSGeometryUtils`, you can use the Swift classes and extensions defined in this library.
 
 See:
-* [MapPoint](https://github.com/googlemaps/google-maps-ios-utils/blob/main/src/GeometryUtils/MapPoint.swift)
-* [CLLocationCoordinate2D+GeometryUtils.swift](https://github.com/googlemaps/google-maps-ios-utils/blob/main/src/GeometryUtils/CLLocationCoordinate2D%2BGeometryUtils.swift)
-* [GMSPath+GeometryUtils.swfit](https://github.com/googlemaps/google-maps-ios-utils/blob/main/src/GeometryUtils/GMSPath%2BGeometryUtils.swift)
-* [GMSPolygon+GeometryUtils.swift](https://github.com/googlemaps/google-maps-ios-utils/blob/main/src/GeometryUtils/GMSPolygon%2BGeometryUtils.swift)
-* [GMSPolyline+GeometryUtils.swift](https://github.com/googlemaps/google-maps-ios-utils/blob/main/src/GeometryUtils/GMSPolyline%2BGeometryUtils.swift)
+* [MapPoint](https://github.com/googlemaps/google-maps-ios-utils/blob/main/Sources/GoogleMapsUtils/GeometryUtils/MapPoint.swift)
+* [CLLocationCoordinate2D+GeometryUtils.swift](https://github.com/googlemaps/google-maps-ios-utils/blob/main/Sources/GoogleMapsUtils/GeometryUtils/CLLocationCoordinate2D%2BGeometryUtils.swift)
+* [GMSPath+GeometryUtils.swfit](https://github.com/googlemaps/google-maps-ios-utils/blob/main/Sources/GoogleMapsUtils/GeometryUtils/GMSPath%2BGeometryUtils.swift)
+* [GMSPolygon+GeometryUtils.swift](https://github.com/googlemaps/google-maps-ios-utils/blob/main/Sources/GoogleMapsUtils/GeometryUtils/GMSPolygon%2BGeometryUtils.swift)
+* [GMSPolyline+GeometryUtils.swift](https://github.com/googlemaps/google-maps-ios-utils/blob/main/Sources/GoogleMapsUtils/GeometryUtils/GMSPolyline%2BGeometryUtils.swift)

release-please-config.json

@@ -1,19 +1,17 @@
 {
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "release-type": "simple",
+  "include-component-in-tag": false,
+  "bump-minor-pre-major": false,
+  "bump-patch-for-minor-pre-major": false,
   "packages": {
     ".": {
       "bootstrap-sha": "b56b39cec0e3d5938ddadbfeb4d3fec541ebbb5e",
       "changelog-path": "CHANGELOG.md",
-      "release-type": "simple",
-      "include-component-in-tag": false,
-      "bump-minor-pre-major": false,
-      "bump-patch-for-minor-pre-major": false,
-      "draft": false,
-      "prerelease": false,
       "extra-files": [
         "Google-Maps-iOS-Utils.podspec",
         "Podfile.template"
       ]
     }
-  },
-  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+  }
 }