From 2370461c9def1d6b09577ef3ec6782384e27c1bc Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Fri, 1 Dec 2017 15:13:43 -0500 Subject: [build] Lint iOS and macOS plists on CI --- Makefile | 9 +++++++++ circle.yml | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index d7678124f5..345f59c553 100644 --- a/Makefile +++ b/Makefile @@ -142,6 +142,10 @@ node: $(MACOS_PROJ_PATH) macos-test: $(MACOS_PROJ_PATH) set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' test $(XCPRETTY) +.PHONY: macos-lint +macos-lint: + find platform/macos -type f -name '*.plist' | xargs plutil -lint + .PHONY: xpackage xpackage: $(MACOS_PROJ_PATH) SYMBOLS=$(SYMBOLS) ./platform/macos/scripts/package.sh @@ -218,6 +222,11 @@ ios: $(IOS_PROJ_PATH) iproj: $(IOS_PROJ_PATH) open $(IOS_WORK_PATH) +.PHONY: ios-lint +ios-lint: + find platform/ios/framework -type f -name '*.plist' | xargs plutil -lint + find platform/ios/app -type f -name '*.plist' | xargs plutil -lint + .PHONY: ios-test ios-test: $(IOS_PROJ_PATH) set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' test $(XCPRETTY) diff --git a/circle.yml b/circle.yml index ee6a833097..36d16c68d6 100644 --- a/circle.yml +++ b/circle.yml @@ -686,6 +686,9 @@ jobs: - *reset-ccache-stats - *build-ios-test - *check-public-symbols + - run: + name: Lint plist files + command: make ios-lint - *show-ccache-stats - *save-cache @@ -742,6 +745,9 @@ jobs: - *reset-ccache-stats - *build-macos-test - *check-public-symbols + - run: + name: Lint plist files + command: make macos-lint - *show-ccache-stats - *save-cache - store_artifacts: -- cgit v1.2.1 From a623ff13ed59e9cd106aed6c3c3c3bc67593e226 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 1 Dec 2017 15:54:27 -0800 Subject: Update gl-js submodule --- mapbox-gl-js | 2 +- platform/node/test/ignores.json | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mapbox-gl-js b/mapbox-gl-js index 7f0bb1c71b..98d8fce6dc 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit 7f0bb1c71b2987330505dbd45e3101fc3f7217c1 +Subproject commit 98d8fce6dc317951a65962036f896c0d1d54b97c diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index f1ddcb7f4a..b55ef3f6da 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -1,14 +1,20 @@ { - "expression-tests/curve/step": "https://github.com/mapbox/mapbox-gl-js/issues/5580", - "expression-tests/curve/interpolate": "https://github.com/mapbox/mapbox-gl-js/issues/5580", + "expression-tests/array/implicit-1": "https://github.com/mapbox/mapbox-gl-native/issues/10533", + "expression-tests/array/implicit-2": "https://github.com/mapbox/mapbox-gl-native/issues/10533", + "expression-tests/array/implicit-3": "https://github.com/mapbox/mapbox-gl-native/issues/10533", + "expression-tests/coalesce/inference": "https://github.com/mapbox/mapbox-gl-native/issues/10588", + "expression-tests/interpolate/linear-color": "https://github.com/mapbox/mapbox-gl-native/issues/10604", + "expression-tests/to-rgba/basic": "https://github.com/mapbox/mapbox-gl-native/issues/10604", "query-tests/circle-stroke-width/inside": "https://github.com/mapbox/mapbox-gl-native/issues/10307", "query-tests/geometry/multilinestring": "needs investigation", "query-tests/geometry/multipolygon": "needs investigation", "query-tests/geometry/polygon": "needs investigation", + "query-tests/regressions/mapbox-gl-js#5172": "https://github.com/mapbox/mapbox-gl-native/issues/10616", "query-tests/symbol/panned-after-insert": "https://github.com/mapbox/mapbox-gl-native/issues/10408", "query-tests/symbol/rotated-after-insert": "https://github.com/mapbox/mapbox-gl-native/issues/10408", "query-tests/world-wrapping/box": "skip - needs issue", "query-tests/world-wrapping/point": "skip - needs issue", + "render-tests/background-color/transition": "https://github.com/mapbox/mapbox-gl-native/issues/10619", "render-tests/debug/collision": "https://github.com/mapbox/mapbox-gl-native/issues/3841", "render-tests/debug/collision-lines": "https://github.com/mapbox/mapbox-gl-native/issues/10412", "render-tests/debug/collision-lines-pitched": "https://github.com/mapbox/mapbox-gl-native/issues/10412", @@ -46,15 +52,21 @@ "render-tests/mixed-zoom/z10-z11": "https://github.com/mapbox/mapbox-gl-native/issues/10397", "render-tests/raster-masking/overlapping-zoom": "https://github.com/mapbox/mapbox-gl-native/issues/10195", "render-tests/regressions/mapbox-gl-js#2305": "https://github.com/mapbox/mapbox-gl-native/issues/6927", + "render-tests/regressions/mapbox-gl-js#2467": "https://github.com/mapbox/mapbox-gl-native/issues/10619", + "render-tests/regressions/mapbox-gl-js#2762": "https://github.com/mapbox/mapbox-gl-native/issues/10619", + "render-tests/regressions/mapbox-gl-js#2769": "https://github.com/mapbox/mapbox-gl-native/issues/10619", "render-tests/regressions/mapbox-gl-js#3682": "https://github.com/mapbox/mapbox-gl-js/issues/3682", + "render-tests/regressions/mapbox-gl-js#4172": "https://github.com/mapbox/mapbox-gl-native/issues/10618", "render-tests/regressions/mapbox-gl-js#5370": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439", "render-tests/regressions/mapbox-gl-js#5599": "https://github.com/mapbox/mapbox-gl-native/issues/10399", + "render-tests/regressions/mapbox-gl-js#5740": "https://github.com/mapbox/mapbox-gl-native/issues/10619", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", "render-tests/runtime-styling/image-add-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/9847", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745", "render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745", "render-tests/symbol-placement/line-overscaled": "https://github.com/mapbox/mapbox-gl-js/issues/5654", "render-tests/symbol-visibility/visible": "https://github.com/mapbox/mapbox-gl-native/issues/10409", + "render-tests/text-font/data-expression": "https://github.com/mapbox/mapbox-gl-native/issues/10535", "render-tests/text-pitch-alignment/auto-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732", "render-tests/text-pitch-alignment/map-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732", "render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732", -- cgit v1.2.1 From cb5dc2eed8e773e6064419f2d40c969b6ec22fdb Mon Sep 17 00:00:00 2001 From: Langston Smith Date: Mon, 4 Dec 2017 08:19:47 -0800 Subject: Android SDK renaming (#10609) * changes in various markdown files * more tweaks * Updated attribution title --- INSTALL.md | 4 ++-- README.md | 2 +- platform/android/CHANGELOG.md | 2 +- platform/android/MapboxGLAndroidSDK/gradle.properties | 2 +- .../android/MapboxGLAndroidSDK/src/main/res/values/strings.xml | 2 +- platform/android/README.md | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index d39c3ad62e..f67de6f3f6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,7 +1,7 @@ # Building & Developing Mapbox GL Native from Source **Just trying to use Mapbox GL Native? You don't need to read this stuff! We -provide [easy-to-install, prebuilt versions of the Mapbox SDKs for iOS and Android +provide [easy-to-install, prebuilt versions of the Mapbox Maps SDKs for iOS and Android that you can download instantly and get started with fast](https://www.mapbox.com/install/).** Still with us? These are the instructions you'll need to build Mapbox GL Native @@ -56,7 +56,7 @@ dependencies: See the relevant SDK documentation for next steps: -* [Mapbox Android SDK](platform/android/) +* [Maps SDK for Android](platform/android/) * [Mapbox iOS SDK](platform/ios/) * [Mapbox macOS SDK](platform/macos/) * [Mapbox Qt SDK](platform/qt/) diff --git a/README.md b/README.md index 8f6ea99704..c483a89005 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This repository hosts the cross-platform Mapbox GL Native library, plus convenie | SDK | Languages | Build status | | --------------------------------------- | ---------------------------------- | ---------------------------------------- | | [Mapbox GL Native](INSTALL.md) | C++14 | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) [![Coverage Status](https://coveralls.io/repos/github/mapbox/mapbox-gl-native/badge.svg?branch=master)](https://coveralls.io/github/mapbox/mapbox-gl-native?branch=master) | -| [Mapbox Android SDK](platform/android/) | Java | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) | +| [Mapbox Maps SDK for Android](platform/android/) | Java | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) | | [Mapbox iOS SDK](platform/ios/) | Objective-C or Swift | [![Bitrise](https://www.bitrise.io/app/7514e4cf3da2cc57.svg?token=OwqZE5rSBR9MVWNr_lf4sA&branch=master)](https://www.bitrise.io/app/7514e4cf3da2cc57) | | [Mapbox macOS SDK](platform/macos/) | Objective-C, Swift, or AppleScript | [![Bitrise](https://www.bitrise.io/app/155ef7da24b38dcd.svg?token=4KSOw_gd6WxTnvGE2rMttg&branch=master)](https://www.bitrise.io/app/155ef7da24b38dcd) | | [node-mapbox-gl-native](platform/node/) | Node.js | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) | diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index b3b41ecbd1..213676c8be 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changelog for Mapbox Android SDK +# Changelog for the Mapbox Maps SDK for Android Mapbox welcomes participation and contributions from everyone. If you'd like to do so please see the [`Contributing Guide`](https://github.com/mapbox/mapbox-gl-native/blob/master/CONTRIBUTING.md) first to get started. diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index a3dab0eff6..7b357bb75c 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -11,7 +11,7 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mapbox POM_DEVELOPER_NAME=Mapbox -POM_NAME=Mapbox Android SDK +POM_NAME=Mapbox Maps SDK for Android POM_ARTIFACT_ID=mapbox-android-sdk POM_PACKAGING=aar diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index 65fb3e14a3..79c2c8d699 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ Attribution icon. Activate to show attribution dialog. Location View. This shows your location on the map. Showing a Map created with Mapbox. Scroll by dragging two fingers. Zoom by pinching two fingers. - Mapbox Android SDK + Mapbox Maps SDK for Android Make Mapbox Maps Better You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data. Agree diff --git a/platform/android/README.md b/platform/android/README.md index d8ec069c6d..05aea56f57 100644 --- a/platform/android/README.md +++ b/platform/android/README.md @@ -1,4 +1,4 @@ -# [Mapbox Android SDK](https://www.mapbox.com/android-sdk/) +# [Mapbox Maps SDK for Android](https://www.mapbox.com/android-sdk/) [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) @@ -10,7 +10,7 @@ Alright. So, actually, you may be in the wrong place. From here on in, this READ **To view our current API documentation, see our [JavaDoc](https://www.mapbox.com/android-sdk/api).** -**To install and use the Mapbox Android SDK in an application, see the [Mapbox Android SDK website](https://www.mapbox.com/install/android/).** +**To install and use the Mapbox Maps SDK for Android in an application, see the [Mapbox Maps SDK for Android website](https://www.mapbox.com/install/android/).** [![](https://www.mapbox.com/android-sdk/images/splash.png)](https://www.mapbox.com/android-sdk/) @@ -31,7 +31,7 @@ git clone git@github.com:mapbox/mapbox-gl-native.git && cd mapbox-gl-native These dependencies are required for all operating systems and all platform targets. - Latest stable [Android Studio](https://developer.android.com/studio/index.html) -- Update Android SDK with latest +- Update the Mapbox Maps SDK for Android with the latest - Android SDK Build-Tools - Android Platform-Tools - Android SDK Tools @@ -86,7 +86,7 @@ More information about building and distributing this project in [DISTRIBUTE.md] #### Using the SDK snapshot -Instead of using the latest stable release of the Mapbox Android SDK, you can use a "snapshot" or the beta version if there is one available. Our snapshots are built every time a Github pull request adds code to this repository's `master` branch. If you'd like to use a snapshot build, your Android project's gradle file should have -SNAPSHOT appended to the SDK version number. For example `5.2.0-SNAPSHOT` or: +Instead of using the latest stable release of the Maps SDK for Android, you can use a "snapshot" or the beta version if there is one available. Our snapshots are built every time a Github pull request adds code to this repository's `master` branch. If you'd like to use a snapshot build, your Android project's gradle file should have -SNAPSHOT appended to the SDK version number. For example `5.2.0-SNAPSHOT` or: ```java // Mapbox SDK dependency -- cgit v1.2.1