Add formatting for Bazel files (#1137)

2023-05-13 17:19:36 +02:00
parent 2b1c2c8aaf
commit 4ebb7c59dc
6 changed files with 93 additions and 74 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,3 +5,10 @@ repos:
  - id: clang-format
    files: '.*\.(hpp|cpp|h)'
    exclude: '(vendor/.*|platform/(ios|darwin)/.*|test/ios/.*|render-test/ios/.*|benchmark/ios/.*)'
+- repo: https://github.com/keith/pre-commit-buildifier
+  rev: 6.1.0
+  hooks:
+    - id: buildifier
+ci:
+  # sometimes fails https://github.com/keith/pre-commit-buildifier/issues/13
+  skip: [buildifier]
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -47,12 +47,15 @@ cc_library(

 genrule(
    name = "git_hash",
-    local = True,
    outs = ["hash"],
-    visibility = ["//visibility:public"],
    cmd = """
        git rev-parse HEAD > $@
-    """
+    """,
+    local = True,
+    visibility = ["//visibility:public"],
 )

-exports_files(["LICENSE.md"], visibility = ["//visibility:public"])
+exports_files(
+    ["LICENSE.md"],
+    visibility = ["//visibility:public"],
+)
--- a/bazel/flags.bzl
+++ b/bazel/flags.bzl
@@ -27,7 +27,7 @@ CPP_FLAGS = WARNING_FLAGS + [
    "-fexceptions",
    "-fno-rtti",
    "-ftemplate-depth=1024",
-    "-std=c++17"
+    "-std=c++17",
 ]
 """
 Compilation flags related to the Maplibre codebase. Relevant for all .cpp .mm and .m code
--- a/platform/ios/BUILD.bazel
+++ b/platform/ios/BUILD.bazel
@@ -115,7 +115,7 @@ info_plist(
 info_plist(
    name = "info_static_plist",
    out = "Info-static.plist",
-    base_info_plist = "platform/ios/framework/Info-static.plist"
+    base_info_plist = "platform/ios/framework/Info-static.plist",
 )

 apple_xcframework(
@@ -154,6 +154,7 @@ ios_framework(
 # sdk for the static target which includes the resources.
 objc_library(
    name = "sdk",
+    hdrs = _PUBLIC_HEADERS,
    data = ["resources"],
    sdk_dylibs = [
        "libz",
@@ -170,7 +171,6 @@ objc_library(
        "objc-sdk",
        "objcpp-sdk",
    ],
-    hdrs = _PUBLIC_HEADERS
 )

 # sdk for the dynamic target. Lacking the resources bundle since for dynamic
@@ -386,49 +386,49 @@ objc_library(
 objc_library(
    name = "iosapp",
    srcs = [
-        "platform/ios/app/MBXAppDelegate.m",
-        "platform/ios/app/MBXState.m",
-        "platform/ios/app/MBXCustomLocationViewController.m",
-        "platform/ios/app/MBXSnapshotsViewController.m",
-        "platform/ios/app/MBXFrameTimeGraphView.m",
-        "platform/ios/app/main.m",
-        "platform/ios/app/MBXCustomCalloutView.m",
-        "platform/ios/app/MBXViewController.m",
-        "platform/ios/app/MBXUserLocationAnnotationView.m",
-        "platform/ios/app/MBXAnnotationView.m",
-        "platform/ios/app/MBXOfflinePacksTableViewController.m",
-        "platform/ios/app/MBXEmbeddedMapViewController.m",
-        "platform/ios/app/MBXOrnamentsViewController.m",
-        "platform/ios/app/MBXStateManager.m",
-        "platform/darwin/app/LimeGreenStyleLayer.m",
        "platform/darwin/app/LimeGreenStyleLayer.h",
+        "platform/darwin/app/LimeGreenStyleLayer.m",
+        "platform/ios/app/MBXAnnotationView.m",
+        "platform/ios/app/MBXAppDelegate.m",
        "platform/ios/app/MBXCustomCalloutView.h",
+        "platform/ios/app/MBXCustomCalloutView.m",
+        "platform/ios/app/MBXCustomLocationViewController.m",
+        "platform/ios/app/MBXEmbeddedMapViewController.m",
+        "platform/ios/app/MBXFrameTimeGraphView.m",
+        "platform/ios/app/MBXOfflinePacksTableViewController.m",
+        "platform/ios/app/MBXOrnamentsViewController.m",
+        "platform/ios/app/MBXSnapshotsViewController.m",
+        "platform/ios/app/MBXState.m",
+        "platform/ios/app/MBXStateManager.m",
+        "platform/ios/app/MBXUserLocationAnnotationView.m",
+        "platform/ios/app/MBXViewController.m",
+        "platform/ios/app/main.m",
    ],
    hdrs = [
-        "platform/ios/app/MBXAppDelegate.h",
-        "platform/ios/app/MBXState.h",
-        "platform/ios/app/MBXCustomLocationViewController.h",
-        "platform/ios/app/MBXSnapshotsViewController.h",
-        "platform/ios/app/MBXFrameTimeGraphView.h",
-        "platform/ios/app/MBXViewController.h",
-        "platform/ios/app/MBXUserLocationAnnotationView.h",
        "platform/ios/app/MBXAnnotationView.h",
-        "platform/ios/app/MBXOfflinePacksTableViewController.h",
+        "platform/ios/app/MBXAppDelegate.h",
+        "platform/ios/app/MBXCustomLocationViewController.h",
        "platform/ios/app/MBXEmbeddedMapViewController.h",
+        "platform/ios/app/MBXFrameTimeGraphView.h",
+        "platform/ios/app/MBXOfflinePacksTableViewController.h",
        "platform/ios/app/MBXOrnamentsViewController.h",
+        "platform/ios/app/MBXSnapshotsViewController.h",
+        "platform/ios/app/MBXState.h",
        "platform/ios/app/MBXStateManager.h",
-        "platform/ios/app/MLNMapView_Experimental.h"
+        "platform/ios/app/MBXUserLocationAnnotationView.h",
+        "platform/ios/app/MBXViewController.h",
+        "platform/ios/app/MLNMapView_Experimental.h",
    ],
    includes = [
        "platform/darwin/app",
+        "platform/darwin/src",
        "platform/ios/src",
-        "platform/darwin/src"
    ],
    sdk_frameworks = [
-        "GLKit" # needed for LimeGreenStyleLayer
+        "GLKit",  # needed for LimeGreenStyleLayer
    ],
    deps = [
-        "sdk-headers"
+        "sdk-headers",
    ],
 )

@@ -444,49 +444,55 @@ _IOS_APPLICATION_RESOURCES = [
    "platform/ios/app/simple_route.json",
    "platform/ios/app/fill_filter_style.json",
    "platform/ios/app/Assets.xcassets",
-        "platform/darwin/test/amsterdam.geojson"
-    ] + glob([
+    "platform/darwin/test/amsterdam.geojson",
+] + glob([
    "platform/ios/app/*.lproj/**",
-    ])
+])

 ios_application(
    name = "App",
    bundle_id = "com.maplibre.app",
-    families = ["iphone", "ipad"],
+    families = [
+        "iphone",
+        "ipad",
+    ],
    infoplists = ["platform/ios/app/Info.plist"],
    minimum_os_version = "12.0",
+    resources = _IOS_APPLICATION_RESOURCES,
    visibility = ["//visibility:public"],
    deps = [
-        "sdk",
        "iosapp",
+        "sdk",
    ],
-    resources = _IOS_APPLICATION_RESOURCES
 )

 ios_application(
    name = "AppDynamicLib",
    bundle_id = "com.maplibre.app",
-    families = ["iphone", "ipad"],
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    frameworks = [
+        "MapLibre.link",
+    ],
    infoplists = ["platform/ios/app/Info.plist"],
    minimum_os_version = "12.0",
+    resources = _IOS_APPLICATION_RESOURCES,
    visibility = ["//visibility:public"],
    deps = [
        "iosapp",
    ],
-    frameworks = [
-        "MapLibre.link"
-    ],
-    resources = _IOS_APPLICATION_RESOURCES
 )

 # Outputs a file with the size of MapLibre as a dynamic library in bytes
 genrule(
    name = "size",
    srcs = [
-        "AppDynamicLib"
+        "AppDynamicLib",
    ],
    outs = [
-        "size-out"
+        "size-out",
    ],
    cmd = """
        unzip $(location AppDynamicLib)
@@ -496,10 +502,13 @@ genrule(

 xcodeproj(
    name = "xcodeproj",
+    minimum_xcode_version = "14",
    project_name = "MapLibre",
    tags = ["manual"],
    top_level_targets = [
-        top_level_target("App", target_environments = ["simulator"]),
+        top_level_target(
+            "App",
+            target_environments = ["simulator"],
+        ),
    ],
-    minimum_xcode_version = "14"
 )
--- a/platform/ios/bazel/macros.bzl
+++ b/platform/ios/bazel/macros.bzl
@@ -3,10 +3,10 @@ def info_plist(name, base_info_plist, out, **kwargs):
        name = name,
        srcs = [
            base_info_plist,
-        "//:git_hash"
+            "//:git_hash",
        ],
        outs = [
-        out
+            out,
        ],
        cmd = """
        cp $(location {}) $@
@@ -17,4 +17,4 @@ def info_plist(name, base_info_plist, out, **kwargs):
        plutil -replace MLNSemanticVersionString -string $$sem_version $@
    """.format(base_info_plist),
        **kwargs
-)
+    )