Skip to content

Commit

Permalink
Change default from master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
kmadsen committed Apr 21, 2021
1 parent 3cf0607 commit a86a614
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ workflows:
filters:
branches:
only:
- master
- main

commands:
build-release:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/java-stable-release-template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### RELEASE_VERSION_NUMBER-alpha.1 pre-release checklist

- [ ] Create a new branch off of `master`.
- [ ] Create a new branch off of `main`.
- [ ] Update the SNAPSHOT version in this repo's `README.md` file
- [ ] Update this repo's `CHANGELOG.md`
- [ ] Change version name to `RELEASE_VERSION_NUMBER-alpha.1` in this repo's `gradle.properties` (make sure to remove `-SNAPSHOT`)
Expand Down Expand Up @@ -32,7 +32,7 @@ Verify the attached files for each module, especially the POM which contains the
- [ ] Report any regressions on this ticket

### Final RELEASE_VERSION_NUMBER release checklist
- [ ] Create a new branch off of `master`.
- [ ] Create a new branch off of `main`.
- [ ] Update this repo's `README.md` file
- [ ] Update `CHANGELOG.md`
- [ ] Change version name to `RELEASE_VERSION_NUMBER` in `gradle.properties` (removing `-SNAPSHOT`)
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Mapbox welcomes participation and contributions from everyone.

### master
### main

### 5.9.0-alpha.5 - April 9, 2021
- Exposed a method to pass a single boolean snapping closure parameter [#1253](https://github.com/mapbox/mapbox-java/pull/1253)
Expand Down Expand Up @@ -431,8 +431,8 @@ Add fields to `StepIntersection`:
* The Mapbox Navigation SDK for Android has been moved into its own repository. Code and tickets can now be followed on [mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) [#439](https://github.com/mapbox/mapbox-java/pull/439)
* Introduced support for the [Optimized Trips API](https://www.mapbox.com/api-documentation/#optimized-trips) [#437](https://github.com/mapbox/mapbox-java/pull/437)
* Added support for the [Directions Matrix API](https://www.mapbox.com/api-documentation/#directions-matrix). This replaces the Distance API [#418](https://github.com/mapbox/mapbox-java/pull/418), which is now deprectated [#405](https://github.com/mapbox/mapbox-java/pull/405)
* Added support for direction [annotations](https://github.com/mapbox/mapbox-java/blob/master/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java#L345-L358) [#417](https://github.com/mapbox/mapbox-java/pull/417)
* Added `setInterval`, `setFastestInterval` and `setSmallestDisplacement` to allow configurable [LocationEngine](https://github.com/mapbox/mapbox-java/blob/master/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngine.java) parameters [#402](https://github.com/mapbox/mapbox-java/pull/402)
* Added support for direction [annotations](https://github.com/mapbox/mapbox-java/blob/main/mapbox/libjava-services/src/main/java/com/mapbox/services/api/directions/v5/MapboxDirections.java#L345-L358) [#417](https://github.com/mapbox/mapbox-java/pull/417)
* Added `setInterval`, `setFastestInterval` and `setSmallestDisplacement` to allow configurable [LocationEngine](https://github.com/mapbox/mapbox-java/blob/main/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngine.java) parameters [#402](https://github.com/mapbox/mapbox-java/pull/402)
* Added setters in `DirectionsResponse` to simplify object creation [#422](https://github.com/mapbox/mapbox-java/pull/422)
* Added `weight` and `weight_name` support to the Directions API response [#438](https://github.com/mapbox/mapbox-java/pull/438)
* Fixed issue where some coordinates were overwritten when setting all origin, destination and a coordinates list inside the directions builder [#420](https://github.com/mapbox/mapbox-java/pull/420)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1 align="center">
<br>
<a href="https://www.mapbox.com/android-docs/java-sdk/overview/"><img src="https://github.com/mapbox/mapbox-java/blob/master/.github/mbxservice-logo.png" alt="Mapbox Service" width="400"></a>
<a href="https://www.mapbox.com/android-docs/java-sdk/overview/"><img src="https://github.com/mapbox/mapbox-java/blob/main/.github/mbxservice-logo.png" alt="Mapbox Service" width="400"></a>
</h1>

<h4 align="center">Build powerful Java apps using Mapbox's tools and services</h4>
Expand All @@ -14,7 +14,7 @@
<img src="https://circleci.com/gh/mapbox/mapbox-java.svg?style=shield&circle-token=:circle-token">
</a>
<a href="https://codecov.io/gh/mapbox/mapbox-java">
<img src="https://codecov.io/gh/mapbox/mapbox-java/branch/master/graph/badge.svg">
<img src="https://codecov.io/gh/mapbox/mapbox-java/branch/main/graph/badge.svg">
</a>
</p>
<br>
Expand Down Expand Up @@ -52,8 +52,8 @@ dependencies {

## Sample code

View [the CLI samples](https://github.com/mapbox/mapbox-java/tree/master/samples/src/main/java/com/mapbox/samples) or download the [Mapbox Demo App](https://play.google.com/store/apps/details?id=com.mapbox.mapboxandroiddemo) to see what's possible with the Mapbox Java SDK. You can also visit the [Mapbox Android examples page](https://www.mapbox.com/android-docs/java-sdk/examples) for additional code examples.
View [the CLI samples](https://github.com/mapbox/mapbox-java/tree/main/samples/src/main/java/com/mapbox/samples) or download the [Mapbox Demo App](https://play.google.com/store/apps/details?id=com.mapbox.mapboxandroiddemo) to see what's possible with the Mapbox Java SDK. You can also visit the [Mapbox Android examples page](https://www.mapbox.com/android-docs/java-sdk/examples) for additional code examples.

## Contributing

All libraries are contained within the `mapbox` folder. You can import the project using Android Studio or IntelliJ IDEA. Read [the contribution guide](https://github.com/mapbox/mapbox-java/blob/master/CONTRIBUTING.md) to get setup properly.
All libraries are contained within the `mapbox` folder. You can import the project using Android Studio or IntelliJ IDEA. Read [the contribution guide](https://github.com/mapbox/mapbox-java/blob/main/CONTRIBUTING.md) to get setup properly.
2 changes: 1 addition & 1 deletion services-turf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Either Gradle or Maven can be used to install the Turf dependency. Visit [docs.m

## Available functionality

[This list](https://github.com/mapbox/mapbox-java/blob/master/docs/turf-port.md) shows the progress made in porting [the various Turf.js methods](http://turfjs.org/docs/) to Java.
[This list](https://github.com/mapbox/mapbox-java/blob/main/docs/turf-port.md) shows the progress made in porting [the various Turf.js methods](http://turfjs.org/docs/) to Java.

Please make a ticket in this repository if there's a Turf.js method that you'd like to see ported to Java.

0 comments on commit a86a614

Please sign in to comment.