forked from mapbox/mapbox-navigation-android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-build
* master: (36 commits) Add bearing for each waypoint (mapbox#408) Adjust (port / land) Top Banners and add secondary text view (mapbox#404) Release 0.6.3 (mapbox#386) Add feedback method (mapbox#392) Project clean up (mapbox#397) limit routeline GeoJSON to maxzoom 16 to avoid creating more clipping mask for high zoom levels (mapbox#391) API Voice instructions (mapbox#394) MAS 3.0 (mapbox#373) Convert NavigationView to View (mapbox#346) only raw location in metrics (mapbox#349) only reroute once users traveled past 50 meters (mapbox#347) Account for different landscape view when adjusting drawable colors API 19 and below (mapbox#343) Send empty arrays properly (mapbox#354) send feedback identifier when the event happens (mapbox#359) Add Null check on the notification manager (mapbox#332) fix hardcoded feedback id generating a new one on each navigation session (mapbox#352) fixed broken link to test app in documentation (mapbox#357) adjusted readme to 0.6.2 (mapbox#333) Release v0.6.2 (mapbox#324) reroute metric (mapbox#296) ... # Conflicts: # app/src/main/java/com/mapbox/services/android/navigation/testapp/activity/MockNavigationActivity.java # navigation/libandroid-navigation/build.gradle # navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/DefaultMilestones.java # navigation/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/offroute/OffRouteDetector.java # scripts/release.py
- Loading branch information
Showing
370 changed files
with
6,076 additions
and
4,025 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,17 @@ | ||
| *.iml | ||
| # Gradle | ||
| .gradle | ||
| /local.properties | ||
| /.idea | ||
| .DS_Store | ||
| /build | ||
|
|
||
| # IntelliJ | ||
| out/ | ||
|
|
||
| build/ | ||
| /captures | ||
| .externalNativeBuild | ||
|
|
||
| # Idea | ||
| .idea | ||
| *.iml | ||
|
|
||
| #MacOS | ||
| .DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,40 @@ | ||
| OSRM_PATH_TRANSLATIONS = navigation/libandroid-navigation/src/main/res/raw/translations | ||
| OSRM_PATH_FIXTURES = navigation/libandroid-navigation/src/test/res/osrm/v5 | ||
|
|
||
| prepare-osrm: | ||
| rm -rf $(OSRM_PATH_TRANSLATIONS) $(OSRM_PATH_FIXTURES) | ||
| mkdir -p $(OSRM_PATH_TRANSLATIONS) $(OSRM_PATH_FIXTURES) | ||
| cp -R ../osrm-text-instructions/languages/translations/* $(OSRM_PATH_TRANSLATIONS) | ||
| cp -R ../osrm-text-instructions/test/fixtures/v5/* $(OSRM_PATH_FIXTURES) | ||
|
|
||
| checkstyle: | ||
| cd navigation; ./gradlew checkstyle | ||
| ./gradlew checkstyle | ||
|
|
||
| sonarqube: | ||
| ./gradlew sonarqube | ||
|
|
||
| test: | ||
| # See navigation/libandroid-navigation/build.gradle for details | ||
| cd navigation; ./gradlew :libandroid-navigation:test | ||
| cd navigation; ./gradlew :libandroid-navigation-ui:test | ||
| # See libandroid-navigation/build.gradle for details | ||
| ./gradlew :libandroid-navigation:test | ||
| ./gradlew :libandroid-navigation-ui:test | ||
|
|
||
| build-release: | ||
| cd navigation; ./gradlew :libandroid-navigation:assembleRelease | ||
| cd navigation; ./gradlew :libandroid-navigation-ui:assembleRelease | ||
| ./gradlew :libandroid-navigation:assembleRelease | ||
| ./gradlew :libandroid-navigation-ui:assembleRelease | ||
|
|
||
| javadoc: | ||
| cd navigation; ./gradlew :libandroid-navigation:javadocrelease | ||
| cd navigation; ./gradlew :libandroid-navigation-ui:javadocrelease | ||
| ./gradlew :libandroid-navigation:javadocrelease | ||
| ./gradlew :libandroid-navigation-ui:javadocrelease | ||
|
|
||
| publish: | ||
| cd navigation; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-navigation:uploadArchives | ||
| cd navigation; export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-navigation-ui:uploadArchives | ||
| export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-navigation:uploadArchives | ||
| export IS_LOCAL_DEVELOPMENT=false; ./gradlew :libandroid-navigation-ui:uploadArchives | ||
|
|
||
| publish-local: | ||
| # This publishes to ~/.m2/repository/com/mapbox/mapboxsdk | ||
| cd navigation; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-navigation:uploadArchives | ||
| cd navigation; export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-navigation-ui:uploadArchives | ||
| export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-navigation:uploadArchives | ||
| export IS_LOCAL_DEVELOPMENT=true; ./gradlew :libandroid-navigation-ui:uploadArchives | ||
|
|
||
| dex-count: | ||
| cd navigation; ./gradlew countDebugDexMethods | ||
| cd navigation; ./gradlew countReleaseDexMethods | ||
| ./gradlew countDebugDexMethods | ||
| ./gradlew countReleaseDexMethods | ||
|
|
||
| navigation-fixtures: | ||
| # Navigation: Taylor street to Page street | ||
| curl "https://api.mapbox.com/directions/v5/mapbox/driving/-122.413165,37.795042;-122.433378,37.7727?geometries=polyline6&overview=full&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \ | ||
| -o navigation/libandroid-navigation/src/test/res/navigation.json | ||
| -o libandroid-navigation/src/test/res/navigation.json | ||
|
|
||
| # Directions: polyline geometry with precision 5 | ||
| curl "https://api.mapbox.com/directions/v5/mapbox/driving/-122.416667,37.783333;-121.900000,37.333333?geometries=polyline&steps=true&access_token=$(MAPBOX_ACCESS_TOKEN)" \ | ||
| -o navigation/libandroid-navigation/src/test/res/directions_v5.json | ||
| -o libandroid-navigation/src/test/res/directions_v5.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| compileSdkVersion androidVersions.compileSdkVersion | ||
| buildToolsVersion androidVersions.buildToolsVersion | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.mapbox.services.android.navigation.testapp" | ||
| minSdkVersion androidVersions.minSdkVersion | ||
| targetSdkVersion androidVersions.targetSdkVersion | ||
| versionCode 1 | ||
| versionName "0.1" | ||
| testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_7 | ||
| targetCompatibility JavaVersion.VERSION_1_7 | ||
| } | ||
|
|
||
| buildTypes { | ||
| debug { | ||
| testCoverageEnabled = false | ||
| } | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
|
|
||
| dexOptions { | ||
| maxProcessCount 8 | ||
| javaMaxHeapSize "2g" | ||
| preDexLibraries true | ||
| } | ||
| } | ||
|
|
||
| sonarqube { | ||
| skipProject = true | ||
| } | ||
|
|
||
| dependencies { | ||
| // Mapbox Navigation SDK | ||
| compile project(':libandroid-navigation-ui') | ||
|
|
||
| // Support libraries | ||
| compile dependenciesList.supportAppcompatV7 | ||
| compile dependenciesList.supportConstraintLayout | ||
|
|
||
| // Mapbox Maps SDK | ||
| compile(dependenciesList.mapboxMapSdk + '@aar') { | ||
| transitive = true | ||
| exclude module: 'lost' | ||
| exclude module: 'mapbox-java-geojson' | ||
| exclude module: 'mapbox-android-telemetry' | ||
| } | ||
|
|
||
| // Mapbox plugins | ||
| compile dependenciesList.locationLayerPlugin | ||
|
|
||
| // Logging | ||
| compile dependenciesList.timber | ||
|
|
||
| // Butter Knife | ||
| compile dependenciesList.butterKnife | ||
| annotationProcessor dependenciesList.butterKnifeProcessor | ||
|
|
||
| // Leak Canary | ||
| debugCompile dependenciesList.leakCanaryDebug | ||
| releaseCompile dependenciesList.leakCanaryRelease | ||
| testCompile dependenciesList.leakCanaryTest | ||
|
|
||
| // Unit Testing | ||
| testCompile dependenciesList.junit | ||
| testCompile dependenciesList.mockito | ||
|
|
||
| // Instrumentation testing | ||
| androidTestCompile(dependenciesList.testEspressoCore, { | ||
| exclude group: 'com.android.support', module: 'support-annotations' | ||
| }) | ||
| } | ||
|
|
||
| apply from: "${rootDir}/gradle/developer-config.gradle" | ||
| apply from: "${rootDir}/gradle/checkstyle.gradle" |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.