[general] moving ios and android project under ./platform folder

maplibre · Dec 20, 2020 · 41f0be3 · 41f0be3
1 parent 8e759a5
commit 41f0be3
Show file tree

Hide file tree

Showing 9,877 changed files with 141 additions and 2,889 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "platform/ios/platform/darwin/docs/theme"]
 	path = platform/ios/platform/darwin/docs/theme
 	url = https://github.com/mapbox/jazzy-theme.git
+[submodule "platform/android/vendor/mapbox-events-android"]
+	path = platform/android/vendor/mapbox-events-android
+	url = https://github.com/mapbox/mapbox-events-android.git
diff --git a/mapbox-gl-native/ARCHITECTURE.md → ARCHITECTURE.md b/mapbox-gl-native/ARCHITECTURE.md → ARCHITECTURE.md
diff --git a/mapbox-gl-native/CHANGELOG.md → CHANGELOG.md b/mapbox-gl-native/CHANGELOG.md → CHANGELOG.md
diff --git a/mapbox-gl-native/CMakeLists.txt → CMakeLists.txt b/mapbox-gl-native/CMakeLists.txt → CMakeLists.txt
diff --git a/mapbox-gl-native-ios/CODE-OF-CONDUCT.md → CODE-OF-CONDUCT.md b/mapbox-gl-native-ios/CODE-OF-CONDUCT.md → CODE-OF-CONDUCT.md
diff --git a/mapbox-gl-native-ios/CONTRIBUTING.md → CONTRIBUTING.md b/mapbox-gl-native-ios/CONTRIBUTING.md → CONTRIBUTING.md
diff --git a/mapbox-gl-native/DEVELOPING.md → DEVELOPING.md b/mapbox-gl-native/DEVELOPING.md → DEVELOPING.md
diff --git a/mapbox-gl-native/LICENSE.mbgl-core.md → LICENSE.mbgl-core.md b/mapbox-gl-native/LICENSE.mbgl-core.md → LICENSE.mbgl-core.md
diff --git a/mapbox-gl-native/LICENSE.md → LICENSE.md b/mapbox-gl-native/LICENSE.md → LICENSE.md
diff --git a/README.md b/README.md
@@ -6,10 +6,10 @@ For iOS and Android
 
 | SDK                                                           | Build   | Build status                                                                                                                                                                                  |
 |---------------------------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | CI      | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci)                   |
-| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release)         |
-| [Mapbox Maps SDK for Android](mapbox-gl-native-android/)      | CI      | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci)           |
-| [Mapbox Maps SDK for Android](mapbox-gl-native-iandroid/)     | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-release) |
+| [Mapbox Maps SDK for iOS](platform/ios/) | CI      | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci)                   |
+| [Mapbox Maps SDK for iOS](platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release)         |
+| [Mapbox Maps SDK for Android](platform/android/)      | CI      | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci)           |
+| [Mapbox Maps SDK for Android](platform/android/)     | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-release) |
 
 ## Installation
 
@@ -57,40 +57,40 @@ You can also download pre-build from releases in this repository.
 ### Source code checkout
 
 ```bash
-git clone --recurse-submodules https://github.com/maptiler/mapbox-gl-mobile.git
+git clone --recurse-submodules https://github.com/maptiler/maplibre-gl-native.git
 ```
 
 ### Build
 
 #### Android
 
-> Make sure you have set Android SDK path in mapbox-gl-native-android/local.properties, variable sdk.dir
+> Make sure you have set Android SDK path in platform/android/local.properties, variable sdk.dir
 
 ```bash
-cd mapbox-gl-native-android
+cd platform/android
 BUILDTYPE=Release make apackage
 ```
 
-Binaries are produced in `mapbox-gl-native-android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar`
-Please refer to [Mapbox Maps SDK for Android](mapbox-gl-native-android/) for detailed instructions.
+Binaries are produced in `platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar`
+Please refer to [Mapbox Maps SDK for Android](platform/android/) for detailed instructions.
 
 #### iOS
 
 ```bash
-cd mapbox-gl-native-ios
+cd platform/ios
 make xcframework BUILDTYPE=Release
 ```
 
-The packaging script will produce a `build/ios/pkg/dynamic`
-Please refer to [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) for detailed instructions.
+The packaging script will produce a `platform/ios/build/ios/pkg/dynamic`
+Please refer to [Mapbox Maps SDK for iOS](platform/ios/platform/ios/) for detailed instructions.
 
 
 #### MacOS
 
 ```bash
-cd mapbox-gl-native-ios
+cd platform/ios
 make xpackage
 ```
 
-This produces a `Mapbox.framework` in the `build/macos/pkg/` folder.
-Please refer to [Mapbox Maps SDK for macos](mapbox-gl-native-ios/platform/macos/) for detailed instructions.
+This produces a `Mapbox.framework` in the `platform/ios/build/macos/pkg/` folder.
+Please refer to [Mapbox Maps SDK for macos](platform/ios/platform/macos/) for detailed instructions.
diff --git a/mapbox-gl-native/appveyor.yml → appveyor.yml b/mapbox-gl-native/appveyor.yml → appveyor.yml
diff --git a/mapbox-gl-native/benchmark/CMakeLists.txt → benchmark/CMakeLists.txt b/mapbox-gl-native/benchmark/CMakeLists.txt → benchmark/CMakeLists.txt
diff --git a/mapbox-gl-native/benchmark/android/README.md → benchmark/android/README.md b/mapbox-gl-native/benchmark/android/README.md → benchmark/android/README.md
diff --git a/...native/benchmark/android/app/build.gradle → benchmark/android/app/build.gradle b/...native/benchmark/android/app/build.gradle → benchmark/android/app/build.gradle
diff --git a/.../java/android/app/NativeActivityTest.java → .../java/android/app/NativeActivityTest.java b/.../java/android/app/NativeActivityTest.java → .../java/android/app/NativeActivityTest.java
diff --git a/...droidTest/java/android/app/TestState.java → ...droidTest/java/android/app/TestState.java b/...droidTest/java/android/app/TestState.java → ...droidTest/java/android/app/TestState.java
diff --git a/.../android/app/src/main/AndroidManifest.xml → .../android/app/src/main/AndroidManifest.xml b/.../android/app/src/main/AndroidManifest.xml → .../android/app/src/main/AndroidManifest.xml
diff --git a/...rk/android/app/src/main/assets/to_zip.txt → ...rk/android/app/src/main/assets/to_zip.txt b/...rk/android/app/src/main/assets/to_zip.txt → ...rk/android/app/src/main/assets/to_zip.txt
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...droid/app/src/main/res/values/strings.xml → ...droid/app/src/main/res/values/strings.xml b/...droid/app/src/main/res/values/strings.xml → ...droid/app/src/main/res/values/strings.xml
diff --git a/...-gl-native/benchmark/android/build.gradle → benchmark/android/build.gradle b/...-gl-native/benchmark/android/build.gradle → benchmark/android/build.gradle
diff --git a/...ative/benchmark/android/gradle.properties → benchmark/android/gradle.properties b/...ative/benchmark/android/gradle.properties → benchmark/android/gradle.properties
diff --git a/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar b/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/mapbox-gl-native/benchmark/android/gradlew → benchmark/android/gradlew b/mapbox-gl-native/benchmark/android/gradlew → benchmark/android/gradlew
diff --git a/...x-gl-native/benchmark/android/gradlew.bat → benchmark/android/gradlew.bat b/...x-gl-native/benchmark/android/gradlew.bat → benchmark/android/gradlew.bat
diff --git a/...-native/benchmark/android/settings.gradle → benchmark/android/settings.gradle b/...-native/benchmark/android/settings.gradle → benchmark/android/settings.gradle
diff --git a/...-native/benchmark/api/query.benchmark.cpp → benchmark/api/query.benchmark.cpp b/...-native/benchmark/api/query.benchmark.cpp → benchmark/api/query.benchmark.cpp
diff --git a/...native/benchmark/api/render.benchmark.cpp → benchmark/api/render.benchmark.cpp b/...native/benchmark/api/render.benchmark.cpp → benchmark/api/render.benchmark.cpp
diff --git a/...gl-native/benchmark/fixtures/api/cache.db → benchmark/fixtures/api/cache.db b/...gl-native/benchmark/fixtures/api/cache.db → benchmark/fixtures/api/cache.db
diff --git a/...benchmark/fixtures/api/default_marker.png → benchmark/fixtures/api/default_marker.png b/...benchmark/fixtures/api/default_marker.png → benchmark/fixtures/api/default_marker.png
diff --git a/...-native/benchmark/fixtures/api/style.json → benchmark/fixtures/api/style.json b/...-native/benchmark/fixtures/api/style.json → benchmark/fixtures/api/style.json
diff --git a/.../fixtures/api/style_formatted_labels.json → .../fixtures/api/style_formatted_labels.json b/.../fixtures/api/style_formatted_labels.json → .../fixtures/api/style_formatted_labels.json
diff --git a/...rk/function/camera_function.benchmark.cpp → ...rk/function/camera_function.benchmark.cpp b/...rk/function/camera_function.benchmark.cpp → ...rk/function/camera_function.benchmark.cpp
diff --git a/...function/composite_function.benchmark.cpp → ...function/composite_function.benchmark.cpp b/...function/composite_function.benchmark.cpp → ...function/composite_function.benchmark.cpp
diff --git a/...rk/function/source_function.benchmark.cpp → ...rk/function/source_function.benchmark.cpp b/...rk/function/source_function.benchmark.cpp → ...rk/function/source_function.benchmark.cpp
diff --git a/...tive/benchmark/include/mbgl/benchmark.hpp → benchmark/include/mbgl/benchmark.hpp b/...tive/benchmark/include/mbgl/benchmark.hpp → benchmark/include/mbgl/benchmark.hpp
diff --git a/...rkApp_iphoneos13.2-arm64e-debug.xctestrun → ...rkApp_iphoneos13.2-arm64e-debug.xctestrun b/...rkApp_iphoneos13.2-arm64e-debug.xctestrun → ...rkApp_iphoneos13.2-arm64e-debug.xctestrun
diff --git a/...App_iphoneos13.2-arm64e-release.xctestrun → ...App_iphoneos13.2-arm64e-release.xctestrun b/...App_iphoneos13.2-arm64e-release.xctestrun → ...App_iphoneos13.2-arm64e-release.xctestrun
diff --git a/mapbox-gl-native/benchmark/ios/Info.plist → benchmark/ios/Info.plist b/mapbox-gl-native/benchmark/ios/Info.plist → benchmark/ios/Info.plist
diff --git a/mapbox-gl-native/benchmark/ios/README.md → benchmark/ios/README.md b/mapbox-gl-native/benchmark/ios/README.md → benchmark/ios/README.md
diff --git a/...designing/BenchmarkApp.app.xcent.template → ...designing/BenchmarkApp.app.xcent.template b/...designing/BenchmarkApp.app.xcent.template → ...designing/BenchmarkApp.app.xcent.template
diff --git a/...g/BenchmarkAppTests.xctest.xcent.template → ...g/BenchmarkAppTests.xctest.xcent.template b/...g/BenchmarkAppTests.xctest.xcent.template → ...g/BenchmarkAppTests.xctest.xcent.template
diff --git a/...utomationSupport.framework.xcent.template → ...utomationSupport.framework.xcent.template b/...utomationSupport.framework.xcent.template → ...utomationSupport.framework.xcent.template
diff --git a/...designing/XCTest.framework.xcent.template → ...designing/XCTest.framework.xcent.template b/...designing/XCTest.framework.xcent.template → ...designing/XCTest.framework.xcent.template
diff --git a/...benchmark/ios/codesigning/codesign_all.sh → benchmark/ios/codesigning/codesign_all.sh b/...benchmark/ios/codesigning/codesign_all.sh → benchmark/ios/codesigning/codesign_all.sh
diff --git a/...s/codesigning/generate-entitlements.swift → ...s/codesigning/generate-entitlements.swift b/...s/codesigning/generate-entitlements.swift → ...s/codesigning/generate-entitlements.swift
diff --git a/...ibXCTestSwiftSupport.dylib.xcent.template → ...ibXCTestSwiftSupport.dylib.xcent.template b/...ibXCTestSwiftSupport.dylib.xcent.template → ...ibXCTestSwiftSupport.dylib.xcent.template
diff --git a/...-gl-native/benchmark/ios/fastlane/Appfile → benchmark/ios/fastlane/Appfile b/...-gl-native/benchmark/ios/fastlane/Appfile → benchmark/ios/fastlane/Appfile
diff --git a/...l-native/benchmark/ios/fastlane/Matchfile → benchmark/ios/fastlane/Matchfile b/...l-native/benchmark/ios/fastlane/Matchfile → benchmark/ios/fastlane/Matchfile
diff --git a/...x-gl-native/benchmark/ios/iosTestRunner.h → benchmark/ios/iosTestRunner.h b/...x-gl-native/benchmark/ios/iosTestRunner.h → benchmark/ios/iosTestRunner.h
diff --git a/...-native/benchmark/ios/ios_test_runner.cpp → benchmark/ios/ios_test_runner.cpp b/...-native/benchmark/ios/ios_test_runner.cpp → benchmark/ios/ios_test_runner.cpp
diff --git a/...-gl-native/benchmark/ios/tests/Info.plist → benchmark/ios/tests/Info.plist b/...-gl-native/benchmark/ios/tests/Info.plist → benchmark/ios/tests/Info.plist
diff --git a/...tive/benchmark/parse/filter.benchmark.cpp → benchmark/parse/filter.benchmark.cpp b/...tive/benchmark/parse/filter.benchmark.cpp → benchmark/parse/filter.benchmark.cpp
diff --git a/...e/benchmark/parse/tile_mask.benchmark.cpp → benchmark/parse/tile_mask.benchmark.cpp b/...e/benchmark/parse/tile_mask.benchmark.cpp → benchmark/parse/tile_mask.benchmark.cpp
diff --git a/...benchmark/parse/vector_tile.benchmark.cpp → benchmark/parse/vector_tile.benchmark.cpp b/...benchmark/parse/vector_tile.benchmark.cpp → benchmark/parse/vector_tile.benchmark.cpp
diff --git a/...enchmark/src/mbgl/benchmark/benchmark.cpp → benchmark/src/mbgl/benchmark/benchmark.cpp b/...enchmark/src/mbgl/benchmark/benchmark.cpp → benchmark/src/mbgl/benchmark/benchmark.cpp
diff --git a/.../benchmark/stub_geometry_tile_feature.hpp → .../benchmark/stub_geometry_tile_feature.hpp b/.../benchmark/stub_geometry_tile_feature.hpp → .../benchmark/stub_geometry_tile_feature.hpp
diff --git a/...rk/storage/offline_database.benchmark.cpp → ...rk/storage/offline_database.benchmark.cpp b/...rk/storage/offline_database.benchmark.cpp → ...rk/storage/offline_database.benchmark.cpp
diff --git a/...-native/benchmark/util/dtoa.benchmark.cpp → benchmark/util/dtoa.benchmark.cpp b/...-native/benchmark/util/dtoa.benchmark.cpp → benchmark/util/dtoa.benchmark.cpp
diff --git a/...ve/benchmark/util/tilecover.benchmark.cpp → benchmark/util/tilecover.benchmark.cpp b/...ve/benchmark/util/tilecover.benchmark.cpp → benchmark/util/tilecover.benchmark.cpp
diff --git a/mapbox-gl-native/bin/CMakeLists.txt → bin/CMakeLists.txt b/mapbox-gl-native/bin/CMakeLists.txt → bin/CMakeLists.txt
diff --git a/mapbox-gl-native/bin/cache.cpp → bin/cache.cpp b/mapbox-gl-native/bin/cache.cpp → bin/cache.cpp
diff --git a/mapbox-gl-native/bin/offline.cpp → bin/offline.cpp b/mapbox-gl-native/bin/offline.cpp → bin/offline.cpp
diff --git a/mapbox-gl-native/bin/offline.sh → bin/offline.sh b/mapbox-gl-native/bin/offline.sh → bin/offline.sh
diff --git a/mapbox-gl-native/bin/render.cpp → bin/render.cpp b/mapbox-gl-native/bin/render.cpp → bin/render.cpp
diff --git a/mapbox-gl-native/circle.yml → circle.yml b/mapbox-gl-native/circle.yml → circle.yml
diff --git a/...-native-ios/cloudformation/ci.template.js → cloudformation/ci.template.js b/...-native-ios/cloudformation/ci.template.js → cloudformation/ci.template.js
diff --git a/mapbox-gl-native/codecov.yml → codecov.yml b/mapbox-gl-native/codecov.yml → codecov.yml
diff --git a/...-gl-native/expression-test/CMakeLists.txt → expression-test/CMakeLists.txt b/...-gl-native/expression-test/CMakeLists.txt → expression-test/CMakeLists.txt
diff --git a/...xpression-test/expression_test_logger.cpp → expression-test/expression_test_logger.cpp b/...xpression-test/expression_test_logger.cpp → expression-test/expression_test_logger.cpp
diff --git a/...xpression-test/expression_test_logger.hpp → expression-test/expression_test_logger.hpp b/...xpression-test/expression_test_logger.hpp → expression-test/expression_test_logger.hpp
diff --git a/...xpression-test/expression_test_parser.cpp → expression-test/expression_test_parser.cpp b/...xpression-test/expression_test_parser.cpp → expression-test/expression_test_parser.cpp
diff --git a/...xpression-test/expression_test_parser.hpp → expression-test/expression_test_parser.hpp b/...xpression-test/expression_test_parser.hpp → expression-test/expression_test_parser.hpp
diff --git a/...xpression-test/expression_test_runner.cpp → expression-test/expression_test_runner.cpp b/...xpression-test/expression_test_runner.cpp → expression-test/expression_test_runner.cpp
diff --git a/...xpression-test/expression_test_runner.hpp → expression-test/expression_test_runner.hpp b/...xpression-test/expression_test_runner.hpp → expression-test/expression_test_runner.hpp
diff --git a/...-gl-native/expression-test/filesystem.hpp → expression-test/filesystem.hpp b/...-gl-native/expression-test/filesystem.hpp → expression-test/filesystem.hpp
diff --git a/mapbox-gl-native/expression-test/main.cpp → expression-test/main.cpp b/mapbox-gl-native/expression-test/main.cpp → expression-test/main.cpp
diff --git a/...ve/expression-test/test_runner_common.cpp → expression-test/test_runner_common.cpp b/...ve/expression-test/test_runner_common.cpp → expression-test/test_runner_common.cpp
diff --git a/...ve/expression-test/test_runner_common.hpp → expression-test/test_runner_common.hpp b/...ve/expression-test/test_runner_common.hpp → expression-test/test_runner_common.hpp
diff --git a/...ox-gl-native/include/mbgl/actor/actor.hpp → include/mbgl/actor/actor.hpp b/...ox-gl-native/include/mbgl/actor/actor.hpp → include/mbgl/actor/actor.hpp
diff --git a/...l-native/include/mbgl/actor/actor_ref.hpp → include/mbgl/actor/actor_ref.hpp b/...l-native/include/mbgl/actor/actor_ref.hpp → include/mbgl/actor/actor_ref.hpp
diff --git a/...ive/include/mbgl/actor/aspiring_actor.hpp → include/mbgl/actor/aspiring_actor.hpp b/...ive/include/mbgl/actor/aspiring_actor.hpp → include/mbgl/actor/aspiring_actor.hpp
diff --git a/.../include/mbgl/actor/established_actor.hpp → include/mbgl/actor/established_actor.hpp b/.../include/mbgl/actor/established_actor.hpp → include/mbgl/actor/established_actor.hpp
diff --git a/...-gl-native/include/mbgl/actor/mailbox.hpp → include/mbgl/actor/mailbox.hpp b/...-gl-native/include/mbgl/actor/mailbox.hpp → include/mbgl/actor/mailbox.hpp
diff --git a/...-gl-native/include/mbgl/actor/message.hpp → include/mbgl/actor/message.hpp b/...-gl-native/include/mbgl/actor/message.hpp → include/mbgl/actor/message.hpp
diff --git a/...l-native/include/mbgl/actor/scheduler.hpp → include/mbgl/actor/scheduler.hpp b/...l-native/include/mbgl/actor/scheduler.hpp → include/mbgl/actor/scheduler.hpp
diff --git a/...ve/include/mbgl/annotation/annotation.hpp → include/mbgl/annotation/annotation.hpp b/...ve/include/mbgl/annotation/annotation.hpp → include/mbgl/annotation/annotation.hpp
diff --git a/...ox-gl-native/include/mbgl/gfx/backend.hpp → include/mbgl/gfx/backend.hpp b/...ox-gl-native/include/mbgl/gfx/backend.hpp → include/mbgl/gfx/backend.hpp
diff --git a/...native/include/mbgl/gfx/backend_scope.hpp → include/mbgl/gfx/backend_scope.hpp b/...native/include/mbgl/gfx/backend_scope.hpp → include/mbgl/gfx/backend_scope.hpp
diff --git a/...gl-native/include/mbgl/gfx/renderable.hpp → include/mbgl/gfx/renderable.hpp b/...gl-native/include/mbgl/gfx/renderable.hpp → include/mbgl/gfx/renderable.hpp
diff --git a/...ive/include/mbgl/gfx/renderer_backend.hpp → include/mbgl/gfx/renderer_backend.hpp b/...ive/include/mbgl/gfx/renderer_backend.hpp → include/mbgl/gfx/renderer_backend.hpp
diff --git a/...tive/include/mbgl/gfx/rendering_stats.hpp → include/mbgl/gfx/rendering_stats.hpp b/...tive/include/mbgl/gfx/rendering_stats.hpp → include/mbgl/gfx/rendering_stats.hpp
diff --git a/...l-native/include/mbgl/gl/custom_layer.hpp → include/mbgl/gl/custom_layer.hpp b/...l-native/include/mbgl/gl/custom_layer.hpp → include/mbgl/gl/custom_layer.hpp
diff --git a/.../include/mbgl/gl/custom_layer_factory.hpp → include/mbgl/gl/custom_layer_factory.hpp b/.../include/mbgl/gl/custom_layer_factory.hpp → include/mbgl/gl/custom_layer_factory.hpp
diff --git a/...e/include/mbgl/gl/renderable_resource.hpp → include/mbgl/gl/renderable_resource.hpp b/...e/include/mbgl/gl/renderable_resource.hpp → include/mbgl/gl/renderable_resource.hpp
diff --git a/...tive/include/mbgl/gl/renderer_backend.hpp → include/mbgl/gl/renderer_backend.hpp b/...tive/include/mbgl/gl/renderer_backend.hpp → include/mbgl/gl/renderer_backend.hpp
diff --git a/...-gl-native/include/mbgl/i18n/collator.hpp → include/mbgl/i18n/collator.hpp b/...-gl-native/include/mbgl/i18n/collator.hpp → include/mbgl/i18n/collator.hpp
diff --git a/...ative/include/mbgl/i18n/number_format.hpp → include/mbgl/i18n/number_format.hpp b/...ative/include/mbgl/i18n/number_format.hpp → include/mbgl/i18n/number_format.hpp
diff --git a/...layermanager/background_layer_factory.hpp → ...layermanager/background_layer_factory.hpp b/...layermanager/background_layer_factory.hpp → ...layermanager/background_layer_factory.hpp
diff --git a/...bgl/layermanager/circle_layer_factory.hpp → ...bgl/layermanager/circle_layer_factory.hpp b/...bgl/layermanager/circle_layer_factory.hpp → ...bgl/layermanager/circle_layer_factory.hpp
diff --git a/...rmanager/fill_extrusion_layer_factory.hpp → ...rmanager/fill_extrusion_layer_factory.hpp b/...rmanager/fill_extrusion_layer_factory.hpp → ...rmanager/fill_extrusion_layer_factory.hpp
diff --git a/.../mbgl/layermanager/fill_layer_factory.hpp → .../mbgl/layermanager/fill_layer_factory.hpp b/.../mbgl/layermanager/fill_layer_factory.hpp → .../mbgl/layermanager/fill_layer_factory.hpp
diff --git a/...gl/layermanager/heatmap_layer_factory.hpp → ...gl/layermanager/heatmap_layer_factory.hpp b/...gl/layermanager/heatmap_layer_factory.hpp → ...gl/layermanager/heatmap_layer_factory.hpp
diff --git a/.../layermanager/hillshade_layer_factory.hpp → .../layermanager/hillshade_layer_factory.hpp b/.../layermanager/hillshade_layer_factory.hpp → .../layermanager/hillshade_layer_factory.hpp
diff --git a/...clude/mbgl/layermanager/layer_factory.hpp → include/mbgl/layermanager/layer_factory.hpp b/...clude/mbgl/layermanager/layer_factory.hpp → include/mbgl/layermanager/layer_factory.hpp
diff --git a/...clude/mbgl/layermanager/layer_manager.hpp → include/mbgl/layermanager/layer_manager.hpp b/...clude/mbgl/layermanager/layer_manager.hpp → include/mbgl/layermanager/layer_manager.hpp
diff --git a/.../mbgl/layermanager/line_layer_factory.hpp → .../mbgl/layermanager/line_layer_factory.hpp b/.../mbgl/layermanager/line_layer_factory.hpp → .../mbgl/layermanager/line_layer_factory.hpp
diff --git a/...ager/location_indicator_layer_factory.hpp → ...ager/location_indicator_layer_factory.hpp b/...ager/location_indicator_layer_factory.hpp → ...ager/location_indicator_layer_factory.hpp
diff --git a/...bgl/layermanager/raster_layer_factory.hpp → ...bgl/layermanager/raster_layer_factory.hpp b/...bgl/layermanager/raster_layer_factory.hpp → ...bgl/layermanager/raster_layer_factory.hpp
diff --git a/...bgl/layermanager/symbol_layer_factory.hpp → ...bgl/layermanager/symbol_layer_factory.hpp b/...bgl/layermanager/symbol_layer_factory.hpp → ...bgl/layermanager/symbol_layer_factory.hpp
diff --git a/...native/include/mbgl/map/bound_options.hpp → include/mbgl/map/bound_options.hpp b/...native/include/mbgl/map/bound_options.hpp → include/mbgl/map/bound_options.hpp
diff --git a/mapbox-gl-native/include/mbgl/map/camera.hpp → include/mbgl/map/camera.hpp b/mapbox-gl-native/include/mbgl/map/camera.hpp → include/mbgl/map/camera.hpp
diff --git a/mapbox-gl-native/include/mbgl/map/change.hpp → include/mbgl/map/change.hpp b/mapbox-gl-native/include/mbgl/map/change.hpp → include/mbgl/map/change.hpp
diff --git a/mapbox-gl-native/include/mbgl/map/map.hpp → include/mbgl/map/map.hpp b/mapbox-gl-native/include/mbgl/map/map.hpp → include/mbgl/map/map.hpp
diff --git a/...-native/include/mbgl/map/map_observer.hpp → include/mbgl/map/map_observer.hpp b/...-native/include/mbgl/map/map_observer.hpp → include/mbgl/map/map_observer.hpp
diff --git a/...l-native/include/mbgl/map/map_options.hpp → include/mbgl/map/map_options.hpp b/...l-native/include/mbgl/map/map_options.hpp → include/mbgl/map/map_options.hpp
diff --git a/mapbox-gl-native/include/mbgl/map/mode.hpp → include/mbgl/map/mode.hpp b/mapbox-gl-native/include/mbgl/map/mode.hpp → include/mbgl/map/mode.hpp
diff --git a/...tive/include/mbgl/map/projection_mode.hpp → include/mbgl/map/projection_mode.hpp b/...tive/include/mbgl/map/projection_mode.hpp → include/mbgl/map/projection_mode.hpp
diff --git a/mapbox-gl-native/include/mbgl/math/clamp.hpp → include/mbgl/math/clamp.hpp b/mapbox-gl-native/include/mbgl/math/clamp.hpp → include/mbgl/math/clamp.hpp
diff --git a/mapbox-gl-native/include/mbgl/math/log2.hpp → include/mbgl/math/log2.hpp b/mapbox-gl-native/include/mbgl/math/log2.hpp → include/mbgl/math/log2.hpp
diff --git a/...ox-gl-native/include/mbgl/math/minmax.hpp → include/mbgl/math/minmax.hpp b/...ox-gl-native/include/mbgl/math/minmax.hpp → include/mbgl/math/minmax.hpp
diff --git a/mapbox-gl-native/include/mbgl/math/wrap.hpp → include/mbgl/math/wrap.hpp b/mapbox-gl-native/include/mbgl/math/wrap.hpp → include/mbgl/math/wrap.hpp
diff --git a/...ve/include/mbgl/platform/gl_functions.hpp → include/mbgl/platform/gl_functions.hpp b/...ve/include/mbgl/platform/gl_functions.hpp → include/mbgl/platform/gl_functions.hpp
diff --git a/...native/include/mbgl/platform/settings.hpp → include/mbgl/platform/settings.hpp b/...native/include/mbgl/platform/settings.hpp → include/mbgl/platform/settings.hpp
diff --git a/...l-native/include/mbgl/platform/thread.hpp → include/mbgl/platform/thread.hpp b/...l-native/include/mbgl/platform/thread.hpp → include/mbgl/platform/thread.hpp
diff --git a/...-gl-native/include/mbgl/platform/time.hpp → include/mbgl/platform/time.hpp b/...-gl-native/include/mbgl/platform/time.hpp → include/mbgl/platform/time.hpp
diff --git a/...gl-native/include/mbgl/renderer/query.hpp → include/mbgl/renderer/query.hpp b/...gl-native/include/mbgl/renderer/query.hpp → include/mbgl/renderer/query.hpp
diff --git a/...native/include/mbgl/renderer/renderer.hpp → include/mbgl/renderer/renderer.hpp b/...native/include/mbgl/renderer/renderer.hpp → include/mbgl/renderer/renderer.hpp
diff --git a/...clude/mbgl/renderer/renderer_frontend.hpp → include/mbgl/renderer/renderer_frontend.hpp b/...clude/mbgl/renderer/renderer_frontend.hpp → include/mbgl/renderer/renderer_frontend.hpp
diff --git a/...clude/mbgl/renderer/renderer_observer.hpp → include/mbgl/renderer/renderer_observer.hpp b/...clude/mbgl/renderer/renderer_observer.hpp → include/mbgl/renderer/renderer_observer.hpp
diff --git a/.../include/mbgl/renderer/renderer_state.hpp → include/mbgl/renderer/renderer_state.hpp b/.../include/mbgl/renderer/renderer_state.hpp → include/mbgl/renderer/renderer_state.hpp
diff --git a/...ude/mbgl/storage/database_file_source.hpp → ...ude/mbgl/storage/database_file_source.hpp b/...ude/mbgl/storage/database_file_source.hpp → ...ude/mbgl/storage/database_file_source.hpp
diff --git a/...tive/include/mbgl/storage/file_source.hpp → include/mbgl/storage/file_source.hpp b/...tive/include/mbgl/storage/file_source.hpp → include/mbgl/storage/file_source.hpp
diff --git a/...lude/mbgl/storage/file_source_manager.hpp → include/mbgl/storage/file_source_manager.hpp b/...lude/mbgl/storage/file_source_manager.hpp → include/mbgl/storage/file_source_manager.hpp
diff --git a/...e/include/mbgl/storage/network_status.hpp → include/mbgl/storage/network_status.hpp b/...e/include/mbgl/storage/network_status.hpp → include/mbgl/storage/network_status.hpp
diff --git a/...l-native/include/mbgl/storage/offline.hpp → include/mbgl/storage/offline.hpp b/...l-native/include/mbgl/storage/offline.hpp → include/mbgl/storage/offline.hpp
diff --git a/...clude/mbgl/storage/online_file_source.hpp → include/mbgl/storage/online_file_source.hpp b/...clude/mbgl/storage/online_file_source.hpp → include/mbgl/storage/online_file_source.hpp
diff --git a/...-native/include/mbgl/storage/resource.hpp → include/mbgl/storage/resource.hpp b/...-native/include/mbgl/storage/resource.hpp → include/mbgl/storage/resource.hpp
diff --git a/...include/mbgl/storage/resource_options.hpp → include/mbgl/storage/resource_options.hpp b/...include/mbgl/storage/resource_options.hpp → include/mbgl/storage/resource_options.hpp
diff --git a/...clude/mbgl/storage/resource_transform.hpp → include/mbgl/storage/resource_transform.hpp b/...clude/mbgl/storage/resource_transform.hpp → include/mbgl/storage/resource_transform.hpp
diff --git a/...-native/include/mbgl/storage/response.hpp → include/mbgl/storage/response.hpp b/...-native/include/mbgl/storage/response.hpp → include/mbgl/storage/response.hpp
diff --git a/.../mbgl/style/color_ramp_property_value.hpp → .../mbgl/style/color_ramp_property_value.hpp b/.../mbgl/style/color_ramp_property_value.hpp → .../mbgl/style/color_ramp_property_value.hpp
diff --git a/...-native/include/mbgl/style/conversion.hpp → include/mbgl/style/conversion.hpp b/...-native/include/mbgl/style/conversion.hpp → include/mbgl/style/conversion.hpp
diff --git a/.../conversion/color_ramp_property_value.hpp → .../conversion/color_ramp_property_value.hpp b/.../conversion/color_ramp_property_value.hpp → .../conversion/color_ramp_property_value.hpp
diff --git a/...nclude/mbgl/style/conversion/constant.hpp → include/mbgl/style/conversion/constant.hpp b/...nclude/mbgl/style/conversion/constant.hpp → include/mbgl/style/conversion/constant.hpp
diff --git a/...lude/mbgl/style/conversion/coordinate.hpp → include/mbgl/style/conversion/coordinate.hpp b/...lude/mbgl/style/conversion/coordinate.hpp → include/mbgl/style/conversion/coordinate.hpp
diff --git a/...ersion/custom_geometry_source_options.hpp → ...ersion/custom_geometry_source_options.hpp b/...ersion/custom_geometry_source_options.hpp → ...ersion/custom_geometry_source_options.hpp
diff --git a/.../include/mbgl/style/conversion/filter.hpp → include/mbgl/style/conversion/filter.hpp b/.../include/mbgl/style/conversion/filter.hpp → include/mbgl/style/conversion/filter.hpp
diff --git a/...nclude/mbgl/style/conversion/function.hpp → include/mbgl/style/conversion/function.hpp b/...nclude/mbgl/style/conversion/function.hpp → include/mbgl/style/conversion/function.hpp
diff --git a/...include/mbgl/style/conversion/geojson.hpp → include/mbgl/style/conversion/geojson.hpp b/...include/mbgl/style/conversion/geojson.hpp → include/mbgl/style/conversion/geojson.hpp
diff --git a/...mbgl/style/conversion/geojson_options.hpp → ...mbgl/style/conversion/geojson_options.hpp b/...mbgl/style/conversion/geojson_options.hpp → ...mbgl/style/conversion/geojson_options.hpp
diff --git a/...e/mbgl/style/conversion/get_json_type.hpp → ...e/mbgl/style/conversion/get_json_type.hpp b/...e/mbgl/style/conversion/get_json_type.hpp → ...e/mbgl/style/conversion/get_json_type.hpp
diff --git a/...e/include/mbgl/style/conversion/layer.hpp → include/mbgl/style/conversion/layer.hpp b/...e/include/mbgl/style/conversion/layer.hpp → include/mbgl/style/conversion/layer.hpp
diff --git a/...e/include/mbgl/style/conversion/light.hpp → include/mbgl/style/conversion/light.hpp b/...e/include/mbgl/style/conversion/light.hpp → include/mbgl/style/conversion/light.hpp
diff --git a/...nclude/mbgl/style/conversion/position.hpp → include/mbgl/style/conversion/position.hpp b/...nclude/mbgl/style/conversion/position.hpp → include/mbgl/style/conversion/position.hpp
diff --git a/.../mbgl/style/conversion/property_value.hpp → .../mbgl/style/conversion/property_value.hpp b/.../mbgl/style/conversion/property_value.hpp → .../mbgl/style/conversion/property_value.hpp
diff --git a/...nclude/mbgl/style/conversion/rotation.hpp → include/mbgl/style/conversion/rotation.hpp b/...nclude/mbgl/style/conversion/rotation.hpp → include/mbgl/style/conversion/rotation.hpp
diff --git a/.../include/mbgl/style/conversion/source.hpp → include/mbgl/style/conversion/source.hpp b/.../include/mbgl/style/conversion/source.hpp → include/mbgl/style/conversion/source.hpp
diff --git a/...include/mbgl/style/conversion/tileset.hpp → include/mbgl/style/conversion/tileset.hpp b/...include/mbgl/style/conversion/tileset.hpp → include/mbgl/style/conversion/tileset.hpp
diff --git a/...l/style/conversion/transition_options.hpp → ...l/style/conversion/transition_options.hpp b/...l/style/conversion/transition_options.hpp → ...l/style/conversion/transition_options.hpp
diff --git a/...ve/include/mbgl/style/conversion_impl.hpp → include/mbgl/style/conversion_impl.hpp b/...ve/include/mbgl/style/conversion_impl.hpp → include/mbgl/style/conversion_impl.hpp
diff --git a/...clude/mbgl/style/expression/assertion.hpp → include/mbgl/style/expression/assertion.hpp b/...clude/mbgl/style/expression/assertion.hpp → include/mbgl/style/expression/assertion.hpp
diff --git a/...tive/include/mbgl/style/expression/at.hpp → include/mbgl/style/expression/at.hpp b/...tive/include/mbgl/style/expression/at.hpp → include/mbgl/style/expression/at.hpp
diff --git a/...bgl/style/expression/boolean_operator.hpp → ...bgl/style/expression/boolean_operator.hpp b/...bgl/style/expression/boolean_operator.hpp → ...bgl/style/expression/boolean_operator.hpp
diff --git a/...ve/include/mbgl/style/expression/case.hpp → include/mbgl/style/expression/case.hpp b/...ve/include/mbgl/style/expression/case.hpp → include/mbgl/style/expression/case.hpp
diff --git a/...e/mbgl/style/expression/check_subtype.hpp → ...e/mbgl/style/expression/check_subtype.hpp b/...e/mbgl/style/expression/check_subtype.hpp → ...e/mbgl/style/expression/check_subtype.hpp
diff --git a/...nclude/mbgl/style/expression/coalesce.hpp → include/mbgl/style/expression/coalesce.hpp b/...nclude/mbgl/style/expression/coalesce.hpp → include/mbgl/style/expression/coalesce.hpp
diff --git a/...nclude/mbgl/style/expression/coercion.hpp → include/mbgl/style/expression/coercion.hpp b/...nclude/mbgl/style/expression/coercion.hpp → include/mbgl/style/expression/coercion.hpp
diff --git a/...nclude/mbgl/style/expression/collator.hpp → include/mbgl/style/expression/collator.hpp b/...nclude/mbgl/style/expression/collator.hpp → include/mbgl/style/expression/collator.hpp
diff --git a/.../style/expression/collator_expression.hpp → .../style/expression/collator_expression.hpp b/.../style/expression/collator_expression.hpp → .../style/expression/collator_expression.hpp
diff --git a/...lude/mbgl/style/expression/comparison.hpp → include/mbgl/style/expression/comparison.hpp b/...lude/mbgl/style/expression/comparison.hpp → include/mbgl/style/expression/comparison.hpp
diff --git a/.../style/expression/compound_expression.hpp → .../style/expression/compound_expression.hpp b/.../style/expression/compound_expression.hpp → .../style/expression/compound_expression.hpp
diff --git a/...nclude/mbgl/style/expression/distance.hpp → include/mbgl/style/expression/distance.hpp b/...nclude/mbgl/style/expression/distance.hpp → include/mbgl/style/expression/distance.hpp
diff --git a/...ive/include/mbgl/style/expression/dsl.hpp → include/mbgl/style/expression/dsl.hpp b/...ive/include/mbgl/style/expression/dsl.hpp → include/mbgl/style/expression/dsl.hpp
diff --git a/...e/include/mbgl/style/expression/error.hpp → include/mbgl/style/expression/error.hpp b/...e/include/mbgl/style/expression/error.hpp → include/mbgl/style/expression/error.hpp
diff --git a/...lude/mbgl/style/expression/expression.hpp → include/mbgl/style/expression/expression.hpp b/...lude/mbgl/style/expression/expression.hpp → include/mbgl/style/expression/expression.hpp
diff --git a/...mbgl/style/expression/find_zoom_curve.hpp → ...mbgl/style/expression/find_zoom_curve.hpp b/...mbgl/style/expression/find_zoom_curve.hpp → ...mbgl/style/expression/find_zoom_curve.hpp
diff --git a/...gl/style/expression/format_expression.hpp → ...gl/style/expression/format_expression.hpp b/...gl/style/expression/format_expression.hpp → ...gl/style/expression/format_expression.hpp
diff --git a/...le/expression/format_section_override.hpp → ...le/expression/format_section_override.hpp b/...le/expression/format_section_override.hpp → ...le/expression/format_section_override.hpp
diff --git a/...clude/mbgl/style/expression/formatted.hpp → include/mbgl/style/expression/formatted.hpp b/...clude/mbgl/style/expression/formatted.hpp → include/mbgl/style/expression/formatted.hpp
diff --git a/...l/style/expression/get_covering_stops.hpp → ...l/style/expression/get_covering_stops.hpp b/...l/style/expression/get_covering_stops.hpp → ...l/style/expression/get_covering_stops.hpp
diff --git a/...e/include/mbgl/style/expression/image.hpp → include/mbgl/style/expression/image.hpp b/...e/include/mbgl/style/expression/image.hpp → include/mbgl/style/expression/image.hpp
diff --git a/...bgl/style/expression/image_expression.hpp → ...bgl/style/expression/image_expression.hpp b/...bgl/style/expression/image_expression.hpp → ...bgl/style/expression/image_expression.hpp
diff --git a/...tive/include/mbgl/style/expression/in.hpp → include/mbgl/style/expression/in.hpp b/...tive/include/mbgl/style/expression/in.hpp → include/mbgl/style/expression/in.hpp
diff --git a/...ude/mbgl/style/expression/interpolate.hpp → ...ude/mbgl/style/expression/interpolate.hpp b/...ude/mbgl/style/expression/interpolate.hpp → ...ude/mbgl/style/expression/interpolate.hpp
diff --git a/...de/mbgl/style/expression/interpolator.hpp → ...de/mbgl/style/expression/interpolator.hpp b/...de/mbgl/style/expression/interpolator.hpp → ...de/mbgl/style/expression/interpolator.hpp
diff --git a/...ude/mbgl/style/expression/is_constant.hpp → ...ude/mbgl/style/expression/is_constant.hpp b/...ude/mbgl/style/expression/is_constant.hpp → ...ude/mbgl/style/expression/is_constant.hpp
diff --git a/...e/mbgl/style/expression/is_expression.hpp → ...e/mbgl/style/expression/is_expression.hpp b/...e/mbgl/style/expression/is_expression.hpp → ...e/mbgl/style/expression/is_expression.hpp
diff --git a/.../include/mbgl/style/expression/length.hpp → include/mbgl/style/expression/length.hpp b/.../include/mbgl/style/expression/length.hpp → include/mbgl/style/expression/length.hpp
diff --git a/...ive/include/mbgl/style/expression/let.hpp → include/mbgl/style/expression/let.hpp b/...ive/include/mbgl/style/expression/let.hpp → include/mbgl/style/expression/let.hpp
diff --git a/...include/mbgl/style/expression/literal.hpp → include/mbgl/style/expression/literal.hpp b/...include/mbgl/style/expression/literal.hpp → include/mbgl/style/expression/literal.hpp
diff --git a/...e/include/mbgl/style/expression/match.hpp → include/mbgl/style/expression/match.hpp b/...e/include/mbgl/style/expression/match.hpp → include/mbgl/style/expression/match.hpp
diff --git a/...e/mbgl/style/expression/number_format.hpp → ...e/mbgl/style/expression/number_format.hpp b/...e/mbgl/style/expression/number_format.hpp → ...e/mbgl/style/expression/number_format.hpp
diff --git a/...mbgl/style/expression/parsing_context.hpp → ...mbgl/style/expression/parsing_context.hpp b/...mbgl/style/expression/parsing_context.hpp → ...mbgl/style/expression/parsing_context.hpp
diff --git a/...ve/include/mbgl/style/expression/step.hpp → include/mbgl/style/expression/step.hpp b/...ve/include/mbgl/style/expression/step.hpp → include/mbgl/style/expression/step.hpp
diff --git a/...ve/include/mbgl/style/expression/type.hpp → include/mbgl/style/expression/type.hpp b/...ve/include/mbgl/style/expression/type.hpp → include/mbgl/style/expression/type.hpp
diff --git a/...e/include/mbgl/style/expression/value.hpp → include/mbgl/style/expression/value.hpp b/...e/include/mbgl/style/expression/value.hpp → include/mbgl/style/expression/value.hpp
diff --git a/.../include/mbgl/style/expression/within.hpp → include/mbgl/style/expression/within.hpp b/.../include/mbgl/style/expression/within.hpp → include/mbgl/style/expression/within.hpp
diff --git a/...x-gl-native/include/mbgl/style/filter.hpp → include/mbgl/style/filter.hpp b/...x-gl-native/include/mbgl/style/filter.hpp → include/mbgl/style/filter.hpp
diff --git a/...ox-gl-native/include/mbgl/style/image.hpp → include/mbgl/style/image.hpp b/...ox-gl-native/include/mbgl/style/image.hpp → include/mbgl/style/image.hpp
diff --git a/...ox-gl-native/include/mbgl/style/layer.hpp → include/mbgl/style/layer.hpp b/...ox-gl-native/include/mbgl/style/layer.hpp → include/mbgl/style/layer.hpp
diff --git a/...e/include/mbgl/style/layer_properties.hpp → include/mbgl/style/layer_properties.hpp b/...e/include/mbgl/style/layer_properties.hpp → include/mbgl/style/layer_properties.hpp
diff --git a/...de/mbgl/style/layers/background_layer.hpp → ...de/mbgl/style/layers/background_layer.hpp b/...de/mbgl/style/layers/background_layer.hpp → ...de/mbgl/style/layers/background_layer.hpp
diff --git a/...nclude/mbgl/style/layers/circle_layer.hpp → include/mbgl/style/layers/circle_layer.hpp b/...nclude/mbgl/style/layers/circle_layer.hpp → include/mbgl/style/layers/circle_layer.hpp
diff --git a/...bgl/style/layers/fill_extrusion_layer.hpp → ...bgl/style/layers/fill_extrusion_layer.hpp b/...bgl/style/layers/fill_extrusion_layer.hpp → ...bgl/style/layers/fill_extrusion_layer.hpp
diff --git a/.../include/mbgl/style/layers/fill_layer.hpp → include/mbgl/style/layers/fill_layer.hpp b/.../include/mbgl/style/layers/fill_layer.hpp → include/mbgl/style/layers/fill_layer.hpp
diff --git a/...clude/mbgl/style/layers/heatmap_layer.hpp → include/mbgl/style/layers/heatmap_layer.hpp b/...clude/mbgl/style/layers/heatmap_layer.hpp → include/mbgl/style/layers/heatmap_layer.hpp
diff --git a/...ude/mbgl/style/layers/hillshade_layer.hpp → ...ude/mbgl/style/layers/hillshade_layer.hpp b/...ude/mbgl/style/layers/hillshade_layer.hpp → ...ude/mbgl/style/layers/hillshade_layer.hpp
diff --git a/...e/include/mbgl/style/layers/layer.hpp.ejs → include/mbgl/style/layers/layer.hpp.ejs b/...e/include/mbgl/style/layers/layer.hpp.ejs → include/mbgl/style/layers/layer.hpp.ejs
diff --git a/.../include/mbgl/style/layers/line_layer.hpp → include/mbgl/style/layers/line_layer.hpp b/.../include/mbgl/style/layers/line_layer.hpp → include/mbgl/style/layers/line_layer.hpp
diff --git a/...style/layers/location_indicator_layer.hpp → ...style/layers/location_indicator_layer.hpp b/...style/layers/location_indicator_layer.hpp → ...style/layers/location_indicator_layer.hpp
diff --git a/...nclude/mbgl/style/layers/raster_layer.hpp → include/mbgl/style/layers/raster_layer.hpp b/...nclude/mbgl/style/layers/raster_layer.hpp → include/mbgl/style/layers/raster_layer.hpp
diff --git a/...nclude/mbgl/style/layers/symbol_layer.hpp → include/mbgl/style/layers/symbol_layer.hpp b/...nclude/mbgl/style/layers/symbol_layer.hpp → include/mbgl/style/layers/symbol_layer.hpp
diff --git a/...ox-gl-native/include/mbgl/style/light.hpp → include/mbgl/style/light.hpp b/...ox-gl-native/include/mbgl/style/light.hpp → include/mbgl/style/light.hpp
diff --git a/...l-native/include/mbgl/style/light.hpp.ejs → include/mbgl/style/light.hpp.ejs b/...l-native/include/mbgl/style/light.hpp.ejs → include/mbgl/style/light.hpp.ejs
diff --git a/...gl-native/include/mbgl/style/position.hpp → include/mbgl/style/position.hpp b/...gl-native/include/mbgl/style/position.hpp → include/mbgl/style/position.hpp
diff --git a/...nclude/mbgl/style/property_expression.hpp → include/mbgl/style/property_expression.hpp b/...nclude/mbgl/style/property_expression.hpp → include/mbgl/style/property_expression.hpp
diff --git a/...ive/include/mbgl/style/property_value.hpp → include/mbgl/style/property_value.hpp b/...ive/include/mbgl/style/property_value.hpp → include/mbgl/style/property_value.hpp
diff --git a/...gl-native/include/mbgl/style/rotation.hpp → include/mbgl/style/rotation.hpp b/...gl-native/include/mbgl/style/rotation.hpp → include/mbgl/style/rotation.hpp
diff --git a/...x-gl-native/include/mbgl/style/source.hpp → include/mbgl/style/source.hpp b/...x-gl-native/include/mbgl/style/source.hpp → include/mbgl/style/source.hpp
diff --git a/.../style/sources/custom_geometry_source.hpp → .../style/sources/custom_geometry_source.hpp b/.../style/sources/custom_geometry_source.hpp → .../style/sources/custom_geometry_source.hpp
diff --git a/...ude/mbgl/style/sources/geojson_source.hpp → ...ude/mbgl/style/sources/geojson_source.hpp b/...ude/mbgl/style/sources/geojson_source.hpp → ...ude/mbgl/style/sources/geojson_source.hpp
diff --git a/...clude/mbgl/style/sources/image_source.hpp → include/mbgl/style/sources/image_source.hpp b/...clude/mbgl/style/sources/image_source.hpp → include/mbgl/style/sources/image_source.hpp
diff --git a/.../mbgl/style/sources/raster_dem_source.hpp → .../mbgl/style/sources/raster_dem_source.hpp b/.../mbgl/style/sources/raster_dem_source.hpp → .../mbgl/style/sources/raster_dem_source.hpp
diff --git a/...lude/mbgl/style/sources/raster_source.hpp → include/mbgl/style/sources/raster_source.hpp b/...lude/mbgl/style/sources/raster_source.hpp → include/mbgl/style/sources/raster_source.hpp
diff --git a/...lude/mbgl/style/sources/vector_source.hpp → include/mbgl/style/sources/vector_source.hpp b/...lude/mbgl/style/sources/vector_source.hpp → include/mbgl/style/sources/vector_source.hpp
diff --git a/...ox-gl-native/include/mbgl/style/style.hpp → include/mbgl/style/style.hpp b/...ox-gl-native/include/mbgl/style/style.hpp → include/mbgl/style/style.hpp
diff --git a/...ive/include/mbgl/style/style_property.hpp → include/mbgl/style/style_property.hpp b/...ive/include/mbgl/style/style_property.hpp → include/mbgl/style/style_property.hpp
diff --git a/...include/mbgl/style/transition_options.hpp → include/mbgl/style/transition_options.hpp b/...include/mbgl/style/transition_options.hpp → include/mbgl/style/transition_options.hpp
diff --git a/...ox-gl-native/include/mbgl/style/types.hpp → include/mbgl/style/types.hpp b/...ox-gl-native/include/mbgl/style/types.hpp → include/mbgl/style/types.hpp
diff --git a/...l-native/include/mbgl/style/undefined.hpp → include/mbgl/style/undefined.hpp b/...l-native/include/mbgl/style/undefined.hpp → include/mbgl/style/undefined.hpp
diff --git a/...x-gl-native/include/mbgl/tile/tile_id.hpp → include/mbgl/tile/tile_id.hpp b/...x-gl-native/include/mbgl/tile/tile_id.hpp → include/mbgl/tile/tile_id.hpp
diff --git a/...tive/include/mbgl/tile/tile_necessity.hpp → include/mbgl/tile/tile_necessity.hpp b/...tive/include/mbgl/tile/tile_necessity.hpp → include/mbgl/tile/tile_necessity.hpp
diff --git a/...ative/include/mbgl/util/async_request.hpp → include/mbgl/util/async_request.hpp b/...ative/include/mbgl/util/async_request.hpp → include/mbgl/util/async_request.hpp
diff --git a/...l-native/include/mbgl/util/async_task.hpp → include/mbgl/util/async_task.hpp b/...l-native/include/mbgl/util/async_task.hpp → include/mbgl/util/async_task.hpp
diff --git a/.../include/mbgl/util/bitmask_operations.hpp → include/mbgl/util/bitmask_operations.hpp b/.../include/mbgl/util/bitmask_operations.hpp → include/mbgl/util/bitmask_operations.hpp
diff --git a/...e/include/mbgl/util/char_array_buffer.hpp → include/mbgl/util/char_array_buffer.hpp b/...e/include/mbgl/util/char_array_buffer.hpp → include/mbgl/util/char_array_buffer.hpp
diff --git a/...ox-gl-native/include/mbgl/util/chrono.hpp → include/mbgl/util/chrono.hpp b/...ox-gl-native/include/mbgl/util/chrono.hpp → include/mbgl/util/chrono.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/color.hpp → include/mbgl/util/color.hpp b/mapbox-gl-native/include/mbgl/util/color.hpp → include/mbgl/util/color.hpp
diff --git a/...-native/include/mbgl/util/compression.hpp → include/mbgl/util/compression.hpp b/...-native/include/mbgl/util/compression.hpp → include/mbgl/util/compression.hpp
diff --git a/...gl-native/include/mbgl/util/constants.hpp → include/mbgl/util/constants.hpp b/...gl-native/include/mbgl/util/constants.hpp → include/mbgl/util/constants.hpp
diff --git a/...x-gl-native/include/mbgl/util/convert.hpp → include/mbgl/util/convert.hpp b/...x-gl-native/include/mbgl/util/convert.hpp → include/mbgl/util/convert.hpp
diff --git a/...tive/include/mbgl/util/default_styles.hpp → include/mbgl/util/default_styles.hpp b/...tive/include/mbgl/util/default_styles.hpp → include/mbgl/util/default_styles.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/enum.hpp → include/mbgl/util/enum.hpp b/mapbox-gl-native/include/mbgl/util/enum.hpp → include/mbgl/util/enum.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/event.hpp → include/mbgl/util/event.hpp b/mapbox-gl-native/include/mbgl/util/event.hpp → include/mbgl/util/event.hpp
diff --git a/...gl-native/include/mbgl/util/exception.hpp → include/mbgl/util/exception.hpp b/...gl-native/include/mbgl/util/exception.hpp → include/mbgl/util/exception.hpp
diff --git a/...-gl-native/include/mbgl/util/expected.hpp → include/mbgl/util/expected.hpp b/...-gl-native/include/mbgl/util/expected.hpp → include/mbgl/util/expected.hpp
diff --git a/...x-gl-native/include/mbgl/util/feature.hpp → include/mbgl/util/feature.hpp b/...x-gl-native/include/mbgl/util/feature.hpp → include/mbgl/util/feature.hpp
diff --git a/...l-native/include/mbgl/util/font_stack.hpp → include/mbgl/util/font_stack.hpp b/...l-native/include/mbgl/util/font_stack.hpp → include/mbgl/util/font_stack.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/geo.hpp → include/mbgl/util/geo.hpp b/mapbox-gl-native/include/mbgl/util/geo.hpp → include/mbgl/util/geo.hpp
diff --git a/...x-gl-native/include/mbgl/util/geojson.hpp → include/mbgl/util/geojson.hpp b/...x-gl-native/include/mbgl/util/geojson.hpp → include/mbgl/util/geojson.hpp
diff --git a/...-gl-native/include/mbgl/util/geometry.hpp → include/mbgl/util/geometry.hpp b/...-gl-native/include/mbgl/util/geometry.hpp → include/mbgl/util/geometry.hpp
diff --git a/...ox-gl-native/include/mbgl/util/ignore.hpp → include/mbgl/util/ignore.hpp b/...ox-gl-native/include/mbgl/util/ignore.hpp → include/mbgl/util/ignore.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/image.hpp → include/mbgl/util/image.hpp b/mapbox-gl-native/include/mbgl/util/image.hpp → include/mbgl/util/image.hpp
diff --git a/...gl-native/include/mbgl/util/immutable.hpp → include/mbgl/util/immutable.hpp b/...gl-native/include/mbgl/util/immutable.hpp → include/mbgl/util/immutable.hpp
diff --git a/...ative/include/mbgl/util/indexed_tuple.hpp → include/mbgl/util/indexed_tuple.hpp b/...ative/include/mbgl/util/indexed_tuple.hpp → include/mbgl/util/indexed_tuple.hpp
diff --git a/...-native/include/mbgl/util/interpolate.hpp → include/mbgl/util/interpolate.hpp b/...-native/include/mbgl/util/interpolate.hpp → include/mbgl/util/interpolate.hpp
diff --git a/...x-gl-native/include/mbgl/util/logging.hpp → include/mbgl/util/logging.hpp b/...x-gl-native/include/mbgl/util/logging.hpp → include/mbgl/util/logging.hpp
diff --git a/...ive/include/mbgl/util/monotonic_timer.hpp → include/mbgl/util/monotonic_timer.hpp b/...ive/include/mbgl/util/monotonic_timer.hpp → include/mbgl/util/monotonic_timer.hpp
diff --git a/...-native/include/mbgl/util/noncopyable.hpp → include/mbgl/util/noncopyable.hpp b/...-native/include/mbgl/util/noncopyable.hpp → include/mbgl/util/noncopyable.hpp
diff --git a/...-gl-native/include/mbgl/util/optional.hpp → include/mbgl/util/optional.hpp b/...-gl-native/include/mbgl/util/optional.hpp → include/mbgl/util/optional.hpp
diff --git a/...l-native/include/mbgl/util/pass_types.hpp → include/mbgl/util/pass_types.hpp b/...l-native/include/mbgl/util/pass_types.hpp → include/mbgl/util/pass_types.hpp
diff --git a/...-gl-native/include/mbgl/util/platform.hpp → include/mbgl/util/platform.hpp b/...-gl-native/include/mbgl/util/platform.hpp → include/mbgl/util/platform.hpp
diff --git a/...-native/include/mbgl/util/premultiply.hpp → include/mbgl/util/premultiply.hpp b/...-native/include/mbgl/util/premultiply.hpp → include/mbgl/util/premultiply.hpp
diff --git a/...l-native/include/mbgl/util/projection.hpp → include/mbgl/util/projection.hpp b/...l-native/include/mbgl/util/projection.hpp → include/mbgl/util/projection.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/range.hpp → include/mbgl/util/range.hpp b/mapbox-gl-native/include/mbgl/util/range.hpp → include/mbgl/util/range.hpp
diff --git a/...-gl-native/include/mbgl/util/run_loop.hpp → include/mbgl/util/run_loop.hpp b/...-gl-native/include/mbgl/util/run_loop.hpp → include/mbgl/util/run_loop.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/size.hpp → include/mbgl/util/size.hpp b/mapbox-gl-native/include/mbgl/util/size.hpp → include/mbgl/util/size.hpp
diff --git a/...ox-gl-native/include/mbgl/util/string.hpp → include/mbgl/util/string.hpp b/...ox-gl-native/include/mbgl/util/string.hpp → include/mbgl/util/string.hpp
diff --git a/...ox-gl-native/include/mbgl/util/thread.hpp → include/mbgl/util/thread.hpp b/...ox-gl-native/include/mbgl/util/thread.hpp → include/mbgl/util/thread.hpp
diff --git a/...x-gl-native/include/mbgl/util/tileset.hpp → include/mbgl/util/tileset.hpp b/...x-gl-native/include/mbgl/util/tileset.hpp → include/mbgl/util/tileset.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/timer.hpp → include/mbgl/util/timer.hpp b/mapbox-gl-native/include/mbgl/util/timer.hpp → include/mbgl/util/timer.hpp
diff --git a/...ox-gl-native/include/mbgl/util/traits.hpp → include/mbgl/util/traits.hpp b/...ox-gl-native/include/mbgl/util/traits.hpp → include/mbgl/util/traits.hpp
diff --git a/...gl-native/include/mbgl/util/type_list.hpp → include/mbgl/util/type_list.hpp b/...gl-native/include/mbgl/util/type_list.hpp → include/mbgl/util/type_list.hpp
diff --git a/...l-native/include/mbgl/util/unitbezier.hpp → include/mbgl/util/unitbezier.hpp b/...l-native/include/mbgl/util/unitbezier.hpp → include/mbgl/util/unitbezier.hpp
diff --git a/mapbox-gl-native/include/mbgl/util/util.hpp → include/mbgl/util/util.hpp b/mapbox-gl-native/include/mbgl/util/util.hpp → include/mbgl/util/util.hpp
diff --git a/...x-gl-native/include/mbgl/util/variant.hpp → include/mbgl/util/variant.hpp b/...x-gl-native/include/mbgl/util/variant.hpp → include/mbgl/util/variant.hpp
diff --git a/...x-gl-native/include/mbgl/util/vectors.hpp → include/mbgl/util/vectors.hpp b/...x-gl-native/include/mbgl/util/vectors.hpp → include/mbgl/util/vectors.hpp
diff --git a/...native/include/mbgl/util/work_request.hpp → include/mbgl/util/work_request.hpp b/...native/include/mbgl/util/work_request.hpp → include/mbgl/util/work_request.hpp
diff --git a/...gl-native/include/mbgl/util/work_task.hpp → include/mbgl/util/work_task.hpp b/...gl-native/include/mbgl/util/work_task.hpp → include/mbgl/util/work_task.hpp
diff --git a/...tive/include/mbgl/util/work_task_impl.hpp → include/mbgl/util/work_task_impl.hpp b/...tive/include/mbgl/util/work_task_impl.hpp → include/mbgl/util/work_task_impl.hpp
diff --git a/mapbox-gl-js b/mapbox-gl-js
diff --git a/mapbox-gl-native-android/.editorconfig b/mapbox-gl-native-android/.editorconfig
diff --git a/mapbox-gl-native-android/.github/PULL_REQUEST_TEMPLATE.md b/mapbox-gl-native-android/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/mapbox-gl-native-android/.gitignore b/mapbox-gl-native-android/.gitignore
diff --git a/mapbox-gl-native-android/.gitmodules b/mapbox-gl-native-android/.gitmodules
diff --git a/mapbox-gl-native-android/vendor/mapbox-events-android b/mapbox-gl-native-android/vendor/mapbox-events-android
diff --git a/mapbox-gl-native-android/vendor/mapbox-gestures-android b/mapbox-gl-native-android/vendor/mapbox-gestures-android
diff --git a/mapbox-gl-native-android/vendor/mapbox-java b/mapbox-gl-native-android/vendor/mapbox-java
diff --git a/mapbox-gl-native-ios/.github/stale.yml b/mapbox-gl-native-ios/.github/stale.yml
diff --git a/mapbox-gl-native-ios/.gitmodules b/mapbox-gl-native-ios/.gitmodules
diff --git a/mapbox-gl-native-ios/platform/darwin/docs/theme b/mapbox-gl-native-ios/platform/darwin/docs/theme
diff --git a/mapbox-gl-native-ios/platform/ios/vendor/mapbox-events-ios b/mapbox-gl-native-ios/platform/ios/vendor/mapbox-events-ios
diff --git a/mapbox-gl-native/.clang-format b/mapbox-gl-native/.clang-format
diff --git a/mapbox-gl-native/.clang-tidy b/mapbox-gl-native/.clang-tidy
diff --git a/mapbox-gl-native/.cmake-format b/mapbox-gl-native/.cmake-format