diff options
-rw-r--r-- | INSTALL.md | 4 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | platform/android/CHANGELOG.md | 2 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/gradle.properties | 2 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml | 2 | ||||
-rw-r--r-- | 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/) @@ -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 @@ <string name="mapbox_attributionsIconContentDescription">Attribution icon. Activate to show attribution dialog.</string> <string name="mapbox_myLocationViewContentDescription">Location View. This shows your location on the map.</string> <string name="mapbox_mapActionDescription">Showing a Map created with Mapbox. Scroll by dragging two fingers. Zoom by pinching two fingers.</string> - <string name="mapbox_attributionsDialogTitle">Mapbox Android SDK</string> + <string name="mapbox_attributionsDialogTitle">Mapbox Maps SDK for Android</string> <string name="mapbox_attributionTelemetryTitle">Make Mapbox Maps Better</string> <string name="mapbox_attributionTelemetryMessage">You are helping to make OpenStreetMap and Mapbox maps better by contributing anonymous usage data.</string> <string name="mapbox_attributionTelemetryPositive">Agree</string> 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 |