chore: update swift-format package (#327)

* chore: change swift-format package
* chore: format swift code

Author: jokerttu

.github/workflows/analyze.yaml

@@ -70,24 +70,24 @@ jobs:
         with:
           path: /home/linuxbrew/.linuxbrew
           key: ${{ runner.os }}-linuxbrew
-      - name: Install swiftformat 0.54.6
+      - name: Install swift-format 600.0.0
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-          curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/4564fbc21a326c4eb349327ce327cbe983bf302a/Formula/s/swiftformat.rb
-          echo 'brew "swiftformat.rb"' > Brewfile
+          curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/402e262f48947bad849ea7793752ff16b7038406/Formula/s/swift-format.rb
+          echo 'brew "swift-format.rb"' > Brewfile
           brew bundle
       - name: Save Cache
         uses: actions/cache/save@v4
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           path: /home/linuxbrew/.linuxbrew
           key: ${{ runner.os }}-linuxbrew
-      - name: Formatter version
+      - name: Print swift-format version
         run: |
           eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          swiftformat --version
+          swift-format --version
       - name: Run format
         if: ${{ success() || failure() }}
         run: |

.swiftformat

@@ -7,13 +7,13 @@ _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#cod
 - **Operating System:** Linux, macOS, or Windows.
 - **Version Control:** [git](https://git-scm.com).
 - **Development Environment:** An IDE such as [Android Studio](https://developer.android.com/studio) or [Visual Studio Code](https://code.visualstudio.com/).
-- **Code Formatting:** [`swiftformat`](https://github.com/nicklockwood/SwiftFormat) (available via brew on macOS, on Windows install Swift toolchain and build SwiftFormat from git sources). 
+- **Code Formatting:** [`swift-format`](https://formulae.brew.sh/formula/swift-formatt). 
 
-### 1.1. Installing swiftformat
-The CI is locked to swiftformat 0.54.6 version which you can install with the command below:
+### 1.1. Installing swift-format
+The CI is locked to swift-format 600.0.0 version which you can install with the command below:
 ```bash
-curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/4564fbc21a326c4eb349327ce327cbe983bf302a/Formula/s/swiftformat.rb
-brew install swiftformat.rb
+curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/402e262f48947bad849ea7793752ff16b7038406/Formula/s/swift-format.rb
+brew install swift-format.rb
 ```
 
 ## 2. Setting Up Your Local Repository

CONTRIBUTING.md

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import UIKit
 import Flutter
 import GoogleMaps
 import GoogleNavigation
+import UIKit
 
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
@@ -25,8 +25,10 @@ import GoogleNavigation
     // 1. Try to find the Maps API key from the environment variables.
     // 2. Try to find the Maps API key from the Dart defines.
     // 3. Use the default Maps API key "YOUR_API_KEY".
-    var mapsApiKey = ProcessInfo.processInfo.environment["MAPS_API_KEY"] ?? findMapApiKeyFromDartDefines("MAPS_API_KEY") ?? ""
-    if (mapsApiKey.isEmpty) {
+    var mapsApiKey =
+      ProcessInfo.processInfo.environment["MAPS_API_KEY"] ?? findMapApiKeyFromDartDefines(
+        "MAPS_API_KEY") ?? ""
+    if mapsApiKey.isEmpty {
       mapsApiKey = "YOUR_API_KEY"
     }
     GMSServices.provideAPIKey(mapsApiKey)
@@ -36,7 +38,7 @@ import GoogleNavigation
 
   // Helper function to find the Maps API key from the Dart defines
   private func findMapApiKeyFromDartDefines(_ defineKey: String) -> String? {
-    if (Bundle.main.infoDictionary!["DART_DEFINES"] == nil) {
+    if Bundle.main.infoDictionary!["DART_DEFINES"] == nil {
       return nil
     }
 
@@ -45,7 +47,7 @@ import GoogleNavigation
     for base64EncodedDartDefine in base64EncodedDartDefines {
       let decoded = String(data: Data(base64Encoded: base64EncodedDartDefine)!, encoding: .utf8)!
       let values = decoded.components(separatedBy: "=")
-      if (values[0] == defineKey && values.count == 2) {
+      if values[0] == defineKey && values.count == 2 {
         return values[1]
       }
     }

example/ios/Runner/AppDelegate.swift

@@ -19,14 +19,15 @@ import GoogleNavigation
 import UIKit
 
 @objc class AppDelegateCarPlay: FlutterAppDelegate {
-  override func application(_ application: UIApplication,
-                            didFinishLaunchingWithOptions launchOptions: [
-                              UIApplication.LaunchOptionsKey: Any
-                            ]?) -> Bool {
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
     // 1. Try to find the Maps API key from the environment variables.
     // 2. Try to find the Maps API key from the Dart defines.
     // 3. Use the default Maps API key "YOUR_API_KEY".
-    var mapsApiKey = ProcessInfo.processInfo
+    var mapsApiKey =
+      ProcessInfo.processInfo
       .environment["MAPS_API_KEY"] ?? findMapApiKeyFromDartDefines("MAPS_API_KEY") ?? ""
     if mapsApiKey.isEmpty {
       mapsApiKey = "YOUR_API_KEY"
@@ -35,9 +36,11 @@ import UIKit
     return true
   }
 
-  override func application(_ application: UIApplication,
-                            configurationForConnecting connectingSceneSession: UISceneSession,
-                            options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+  override func application(
+    _ application: UIApplication,
+    configurationForConnecting connectingSceneSession: UISceneSession,
+    options: UIScene.ConnectionOptions
+  ) -> UISceneConfiguration {
     if connectingSceneSession.role == .carTemplateApplication {
       let scene = UISceneConfiguration(name: "CarPlay", sessionRole: connectingSceneSession.role)
       scene.delegateClass = CarSceneDelegate.self

example/ios/Runner/AppDelegateCarPlay.swift

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 import CarPlay
-import google_navigation_flutter
 import GoogleNavigation
 import UIKit
+import google_navigation_flutter
 
 class CarSceneDelegate: BaseCarSceneDelegate {
   override func getTemplate() -> CPMapTemplate {

example/ios/Runner/CarSceneDelegate.swift

@@ -17,8 +17,10 @@ import UIKit
 class PhoneSceneDelegate: UIResponder, UIWindowSceneDelegate {
   var window: UIWindow?
 
-  func scene(_ scene: UIScene, willConnectTo session: UISceneSession,
-             options connectionOptions: UIScene.ConnectionOptions) {
+  func scene(
+    _ scene: UIScene, willConnectTo session: UISceneSession,
+    options connectionOptions: UIScene.ConnectionOptions
+  ) {
     if let windowScene = scene as? UIWindowScene {
       window = UIWindow(windowScene: windowScene)
       let flutterEngine = FlutterEngine(name: "PhoneSceneDelegateEngine")

example/ios/Runner/PhoneSceneDelegate.swift

@@ -114,7 +114,7 @@ class ConvertTests: XCTestCase {
             latitude: 55.0,
             longitude: 44.0
           )
-        ),
+        )
       ],
       displayOptions: NavigationDisplayOptionsDto()
     )
@@ -129,7 +129,7 @@ class ConvertTests: XCTestCase {
         .init(
           title: "test",
           placeID: "id"
-        ),
+        )
       ],
       displayOptions: NavigationDisplayOptionsDto()
     )
@@ -173,8 +173,9 @@ class ConvertTests: XCTestCase {
     XCTAssertTrue(Convert.convertRouteStatus(.waypointError) == .waypointError)
     XCTAssertTrue(Convert.convertRouteStatus(.apiKeyNotAuthorized) == .apiKeyNotAuthorized)
     XCTAssertTrue(Convert.convertRouteStatus(.canceled) == .statusCanceled)
-    XCTAssertTrue(Convert
-      .convertRouteStatus(.duplicateWaypointsError) == .duplicateWaypointsError)
+    XCTAssertTrue(
+      Convert
+        .convertRouteStatus(.duplicateWaypointsError) == .duplicateWaypointsError)
     XCTAssertTrue(Convert.convertRouteStatus(.internalError) == .internalError)
     XCTAssertTrue(Convert.convertRouteStatus(.locationUnavailable) == .locationUnavailable)
     XCTAssertTrue(Convert.convertRouteStatus(.OK) == .statusOk)
@@ -197,25 +198,28 @@ class ConvertTests: XCTestCase {
 
   func testConvertGMSSpeedAlertSeverity() {
     XCTAssertTrue(Convert.convertSpeedAlertSeverity(gmsSpeedAlertSeverity: .unknown) == .unknown)
-    XCTAssertTrue(Convert
-      .convertSpeedAlertSeverity(gmsSpeedAlertSeverity: .notSpeeding) == .notSpeeding)
+    XCTAssertTrue(
+      Convert
+        .convertSpeedAlertSeverity(gmsSpeedAlertSeverity: .notSpeeding) == .notSpeeding)
     XCTAssertTrue(Convert.convertSpeedAlertSeverity(gmsSpeedAlertSeverity: .minor) == .minor)
     XCTAssertTrue(Convert.convertSpeedAlertSeverity(gmsSpeedAlertSeverity: .major) == .major)
   }
 
   func testConvertSpeedAlertSeverity() {
     XCTAssertTrue(Convert.convertSpeedAlertSeverity(speedAlertSeverity: .unknown) == .unknown)
-    XCTAssertTrue(Convert
-      .convertSpeedAlertSeverity(speedAlertSeverity: .notSpeeding) == .notSpeeding)
+    XCTAssertTrue(
+      Convert
+        .convertSpeedAlertSeverity(speedAlertSeverity: .notSpeeding) == .notSpeeding)
     XCTAssertTrue(Convert.convertSpeedAlertSeverity(speedAlertSeverity: .minor) == .minor)
     XCTAssertTrue(Convert.convertSpeedAlertSeverity(speedAlertSeverity: .major) == .major)
   }
 
   func testConvertNavigationAudioGuidanceType() {
     XCTAssertTrue(Convert.convertNavigationAudioGuidanceType(.silent) == .silent)
     XCTAssertTrue(Convert.convertNavigationAudioGuidanceType(.alertsOnly) == .alertsOnly)
-    XCTAssertTrue(Convert
-      .convertNavigationAudioGuidanceType(.alertsAndGuidance) == .alertsAndGuidance)
+    XCTAssertTrue(
+      Convert
+        .convertNavigationAudioGuidanceType(.alertsAndGuidance) == .alertsAndGuidance)
   }
 
   func testMarkerDtoToGMSMarkerAndBack() {
@@ -365,12 +369,16 @@ class ConvertTests: XCTestCase {
     let polygon = PolygonDto(
       polygonId: "Polygon_0",
       options: .init(
-        points: [LatLngDto(latitude: 10.0, longitude: 20.0),
-                 LatLngDto(latitude: 30.0, longitude: 40.0)],
-        holes: [PolygonHoleDto(points: [
-          LatLngDto(latitude: 50.0, longitude: 60.0),
-          LatLngDto(latitude: 70.0, longitude: 80.0),
-        ])],
+        points: [
+          LatLngDto(latitude: 10.0, longitude: 20.0),
+          LatLngDto(latitude: 30.0, longitude: 40.0),
+        ],
+        holes: [
+          PolygonHoleDto(points: [
+            LatLngDto(latitude: 50.0, longitude: 60.0),
+            LatLngDto(latitude: 70.0, longitude: 80.0),
+          ])
+        ],
         clickable: true,
         fillColor: UIColor.red.toRgb()!,
         geodesic: true,
@@ -404,12 +412,16 @@ class ConvertTests: XCTestCase {
     let polygon = PolygonDto(
       polygonId: "Polygon_0",
       options: .init(
-        points: [LatLngDto(latitude: 10.0, longitude: 20.0),
-                 LatLngDto(latitude: 30.0, longitude: 40.0)],
-        holes: [PolygonHoleDto(points: [
-          LatLngDto(latitude: 50.0, longitude: 60.0),
-          LatLngDto(latitude: 70.0, longitude: 80.0),
-        ])],
+        points: [
+          LatLngDto(latitude: 10.0, longitude: 20.0),
+          LatLngDto(latitude: 30.0, longitude: 40.0),
+        ],
+        holes: [
+          PolygonHoleDto(points: [
+            LatLngDto(latitude: 50.0, longitude: 60.0),
+            LatLngDto(latitude: 70.0, longitude: 80.0),
+          ])
+        ],
         clickable: true,
         fillColor: UIColor.red.toRgb()!,
         geodesic: true,
@@ -543,8 +555,9 @@ class ConvertTests: XCTestCase {
     )
 
     let navigationViewOptions =
-      NavigationViewOptionsDto(navigationUIEnabledPreference: NavigationUIEnabledPreferenceDto
-        .automatic)
+      NavigationViewOptionsDto(
+        navigationUIEnabledPreference: NavigationUIEnabledPreferenceDto
+          .automatic)
 
     let configuration = Convert.convertMapOptions(mapOptions)
 

example/ios/RunnerTests/ConvertTests.swift

@@ -20,10 +20,10 @@ import PackageDescription
 let package = Package(
   name: "google_navigation_flutter",
   platforms: [
-    .iOS("15.0"),
+    .iOS("15.0")
   ],
   products: [
-    .library(name: "google-navigation-flutter", targets: ["google_navigation_flutter"]),
+    .library(name: "google-navigation-flutter", targets: ["google_navigation_flutter"])
   ],
   dependencies: [
     .package(
@@ -49,8 +49,8 @@ let package = Package(
         ),
       ],
       resources: [
-        .process("PrivacyInfo.xcprivacy"),
+        .process("PrivacyInfo.xcprivacy")
       ]
-    ),
+    )
   ]
 )

ios/google_navigation_flutter/Package.swift

@@ -17,7 +17,8 @@ import Foundation
 import GoogleMaps
 
 open class BaseCarSceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate,
-  CPMapTemplateDelegate {
+  CPMapTemplateDelegate
+{
   private var interfaceController: CPInterfaceController?
   private var carWindow: CPWindow?
   private var mapTemplate: CPMapTemplate?
@@ -31,9 +32,11 @@ open class BaseCarSceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate
     navView
   }
 
-  public func templateApplicationScene(_ templateApplicationScene: CPTemplateApplicationScene,
-                                       didConnect interfaceController: CPInterfaceController,
-                                       to window: CPWindow) {
+  public func templateApplicationScene(
+    _ templateApplicationScene: CPTemplateApplicationScene,
+    didConnect interfaceController: CPInterfaceController,
+    to window: CPWindow
+  ) {
     self.interfaceController = interfaceController
     carWindow = window
     mapTemplate = getTemplate()
@@ -48,9 +51,11 @@ open class BaseCarSceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate
     return template
   }
 
-  open func templateApplicationScene(_ templateApplicationScene: CPTemplateApplicationScene,
-                                     didDisconnect interfaceController: CPInterfaceController,
-                                     from window: CPWindow) {
+  open func templateApplicationScene(
+    _ templateApplicationScene: CPTemplateApplicationScene,
+    didDisconnect interfaceController: CPInterfaceController,
+    from window: CPWindow
+  ) {
     self.interfaceController = nil
     carWindow?.rootViewController = nil
     carWindow = nil
@@ -110,8 +115,10 @@ open class BaseCarSceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate
   }
 
   // CPMapTemplateDelegate
-  open func mapTemplate(_ mapTemplate: CPMapTemplate,
-                        panWith direction: CPMapTemplate.PanDirection) {
+  open func mapTemplate(
+    _ mapTemplate: CPMapTemplate,
+    panWith direction: CPMapTemplate.PanDirection
+  ) {
     let scrollAmount = scrollAmount(for: direction)
     navView?.animateCameraByScroll(dx: scrollAmount.x, dy: scrollAmount.y)
   }

ios/google_navigation_flutter/Sources/google_navigation_flutter/BaseCarSceneDelegate.swift

@@ -17,7 +17,8 @@ import GoogleMaps
 
 extension Convert {
   static func convertNavigationUIEnabledPreference(preference: NavigationUIEnabledPreferenceDto?)
-    -> NavigationUIEnabledPreference {
+    -> NavigationUIEnabledPreference
+  {
     switch preference {
     case .automatic:
       return .automatic
@@ -29,7 +30,8 @@ extension Convert {
   }
 
   static func convertMapOptions(_ mapOptions: MapOptionsDto)
-    -> MapConfiguration {
+    -> MapConfiguration
+  {
     let cameraTargetBounds: GMSCoordinateBounds?
     if let bounds = mapOptions.cameraTargetBounds {
       cameraTargetBounds = convertLatLngBounds(bounds: bounds)