merge onboard, offboard and hybrid routers into a single module

LICENSE.md

@@ -40,53 +40,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ### Hybrid Router SDK module  
 ---------------------------------------
-Mapbox Navigation uses portions of the IntelliJ IDEA Annotations (A set of annotations used for code inspection support and code documentation.).
-URL: [http://www.jetbrains.org](http://www.jetbrains.org)
-License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the kotlinx-coroutines-android (Coroutines support libraries for Kotlin).
-URL: [https://github.com/Kotlin/kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines)
-License: [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the kotlinx-coroutines-core (Coroutines support libraries for Kotlin).
-URL: [https://github.com/Kotlin/kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines)
-License: [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib (Kotlin Standard Library for JVM).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib-common (Kotlin Common Standard Library).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib-jdk7 (Kotlin Standard Library JDK 7 extension).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib-jdk8 (Kotlin Standard Library JDK 8 extension).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-
-
-
-### Offboard Router SDK module  
----------------------------------------
 Mapbox Navigation uses portions of the Android Support Library Annotations (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs.).
 URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html)
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -109,73 +62,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-Mapbox Navigation uses portions of the Mapbox Java SDK.
-URL: [https://github.com/mapbox/mapbox-java](https://github.com/mapbox/mapbox-java)
-License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the OkHttp.
-License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the OkHttp Logging Interceptor.
-License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the Okio.
-License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib (Kotlin Standard Library for JVM).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib-common (Kotlin Common Standard Library).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib-jdk7 (Kotlin Standard Library JDK 7 extension).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib-jdk8 (Kotlin Standard Library JDK 8 extension).
-URL: [https://kotlinlang.org/](https://kotlinlang.org/)
-License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the Retrofit.
-License: [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-
-
-
-### Onboard Router SDK module  
----------------------------------------
-Mapbox Navigation uses portions of the Android Support Library Annotations (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs.).
-URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html)
-License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
-Mapbox Navigation uses portions of the IntelliJ IDEA Annotations (A set of annotations used for code inspection support and code documentation.).
-URL: [http://www.jetbrains.org](http://www.jetbrains.org)
-License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
 Mapbox Navigation uses portions of the kotlinx-coroutines-android (Coroutines support libraries for Kotlin).
 URL: [https://github.com/Kotlin/kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines)
 License: [The Apache Software License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -200,6 +86,12 @@ License: [BSD](https://opensource.org/licenses/BSD-2-Clause)
 
 ===========================================================================
 
+Mapbox Navigation uses portions of the Mapbox Java SDK.
+URL: [https://github.com/mapbox/mapbox-java](https://github.com/mapbox/mapbox-java)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
 Mapbox Navigation uses portions of the OkHttp.
 License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -210,6 +102,12 @@ License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
+Mapbox Navigation uses portions of the Okio (A modern I/O API for Java).
+URL: [https://github.com/square/okio/](https://github.com/square/okio/)
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
 Mapbox Navigation uses portions of the org.jetbrains.kotlin:kotlin-stdlib (Kotlin Standard Library for JVM).
 URL: [https://kotlinlang.org/](https://kotlinlang.org/)
 License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -234,6 +132,11 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS
 
 ===========================================================================
 
+Mapbox Navigation uses portions of the Retrofit.
+License: [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
 
 
 

Makefile

@@ -1,7 +1,5 @@
 CORE_MODULES = \
-libdirections-offboard \
-libdirections-hybrid \
-libdirections-onboard \
+libnavigation-router \
 libnavigation-base \
 libnavigation-metrics \
 libnavigation-util \
@@ -83,9 +81,7 @@ core-dependency-graph:
 
 .PHONY: core-check-api
 core-check-api:
-	./gradlew :libdirections-offboard:checkApi -PhidePackage=com.mapbox.navigation.route.offboard.internal
-	./gradlew :libdirections-hybrid:checkApi -PhidePackage=com.mapbox.navigation.route.hybrid.internal
-	./gradlew :libdirections-onboard:checkApi -PhidePackage=com.mapbox.navigation.route.onboard.internal
+	./gradlew :libnavigation-router:checkApi -PhidePackage=com.mapbox.navigation.route.internal
 	./gradlew :libnavigation-base:checkApi -PhidePackage=com.mapbox.navigation.base.internal
 	./gradlew :libnavigation-metrics:checkApi -PhidePackage=com.mapbox.navigation.metrics.internal
 	./gradlew :libnavigation-util:checkApi -PhidePackage=com.mapbox.navigation.utils.internal
@@ -95,9 +91,7 @@ core-check-api:
 
 .PHONY: core-update-api
 core-update-api:
-	./gradlew :libdirections-offboard:updateApi -PhidePackage=com.mapbox.navigation.route.offboard.internal
-	./gradlew :libdirections-hybrid:updateApi -PhidePackage=com.mapbox.navigation.route.hybrid.internal
-	./gradlew :libdirections-onboard:updateApi -PhidePackage=com.mapbox.navigation.route.onboard.internal
+	./gradlew :libnavigation-router:updateApi -PhidePackage=com.mapbox.navigation.route.internal
 	./gradlew :libnavigation-base:updateApi -PhidePackage=com.mapbox.navigation.base.internal
 	./gradlew :libnavigation-metrics:updateApi -PhidePackage=com.mapbox.navigation.metrics.internal
 	./gradlew :libnavigation-util:updateApi -PhidePackage=com.mapbox.navigation.utils.internal

circle.yml

@@ -38,15 +38,15 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - deps-{{ checksum "build.gradle" }}-{{ checksum  "gradle/dependencies.gradle" }}-{{ checksum  "examples/build.gradle" }}-{{ checksum  "libdirections-hybrid/build.gradle" }}-{{ checksum  "libdirections-offboard/build.gradle" }}-{{ checksum  "libdirections-onboard/build.gradle" }}-{{ checksum  "libnavigation-base/build.gradle" }}-{{ checksum  "libnavigation-core/build.gradle" }}-{{ checksum  "libnavigation-metrics/build.gradle" }}-{{ checksum  "libnavigation-util/build.gradle" }}-{{ checksum  "libnavigator/build.gradle" }}-{{ checksum  "libtrip-notification/build.gradle" }}-{{ checksum  "libtesting-ui/build.gradle" }}-{{ checksum  "libtesting-utils/build.gradle" }}-{{ checksum  "libnavigation-ui/build.gradle" }}
+            - deps-{{ checksum "build.gradle" }}-{{ checksum  "gradle/dependencies.gradle" }}-{{ checksum  "examples/build.gradle" }}-{{ checksum  "libnavigation-router/build.gradle" }}-{{ checksum  "libnavigation-base/build.gradle" }}-{{ checksum  "libnavigation-core/build.gradle" }}-{{ checksum  "libnavigation-metrics/build.gradle" }}-{{ checksum  "libnavigation-util/build.gradle" }}-{{ checksum  "libnavigator/build.gradle" }}-{{ checksum  "libtrip-notification/build.gradle" }}-{{ checksum  "libtesting-ui/build.gradle" }}-{{ checksum  "libtesting-utils/build.gradle" }}-{{ checksum  "libnavigation-ui/build.gradle" }}
             - deps-
       - run:
           name: Download Dependencies
           command: ./gradlew androidDependencies
       - save_cache:
           paths:
             - ~/.gradle
-          key: deps-{{ checksum "build.gradle" }}-{{ checksum  "gradle/dependencies.gradle" }}-{{ checksum  "examples/build.gradle" }}-{{ checksum  "libdirections-hybrid/build.gradle" }}-{{ checksum  "libdirections-offboard/build.gradle" }}-{{ checksum  "libdirections-onboard/build.gradle" }}-{{ checksum  "libnavigation-base/build.gradle" }}-{{ checksum  "libnavigation-core/build.gradle" }}-{{ checksum  "libnavigation-metrics/build.gradle" }}-{{ checksum  "libnavigation-util/build.gradle" }}-{{ checksum  "libnavigator/build.gradle" }}-{{ checksum  "libtrip-notification/build.gradle" }}-{{ checksum  "libtesting-ui/build.gradle" }}-{{ checksum  "libtesting-utils/build.gradle" }}-{{ checksum  "libnavigation-ui/build.gradle" }}
+          key: deps-{{ checksum "build.gradle" }}-{{ checksum  "gradle/dependencies.gradle" }}-{{ checksum  "examples/build.gradle" }}-{{ checksum  "libnavigation-router/build.gradle" }}-{{ checksum  "libnavigation-base/build.gradle" }}-{{ checksum  "libnavigation-core/build.gradle" }}-{{ checksum  "libnavigation-metrics/build.gradle" }}-{{ checksum  "libnavigation-util/build.gradle" }}-{{ checksum  "libnavigator/build.gradle" }}-{{ checksum  "libtrip-notification/build.gradle" }}-{{ checksum  "libtesting-ui/build.gradle" }}-{{ checksum  "libtesting-utils/build.gradle" }}-{{ checksum  "libnavigation-ui/build.gradle" }}
 
   verify:
     steps:
@@ -159,11 +159,7 @@ commands:
           name: Run Navigation Core SDK Unit Tests
           command: make core-unit-tests
       - store-results:
-          module_target: "libdirections-hybrid"
-      - store-results:
-          module_target: "libdirections-offboard"
-      - store-results:
-          module_target: "libdirections-onboard"
+          module_target: "libnavigation-router"
       - store-results:
           module_target: "libnavigation-base"
       - store-results:

examples/build.gradle

@@ -78,9 +78,7 @@ android {
 dependencies {
     // Mapbox Navigation SDK
     implementation project(':libnavigation-metrics')
-    implementation project(':libdirections-offboard')
-    implementation project(':libdirections-onboard')
-    implementation project(':libdirections-hybrid')
+    implementation project(':libnavigation-router')
     implementation project(':libtrip-notification')
     implementation project(':libnavigation-util')
     implementation project(':libnavigator')

gradle/publish.gradle

@@ -54,9 +54,7 @@ sdkNameMap["libnavigation-core"] = "mobile-navigation-core"
 sdkNameMap["libnavigation-metrics"] = "mobile-navigation-metrics"
 sdkNameMap["libnavigator"] = "mobile-navigation-navigator"
 sdkNameMap["libtrip-notification"] = "mobile-navigation-notification"
-sdkNameMap["libdirections-hybrid"] = "mobile-navigation-router"
-sdkNameMap["libdirections-offboard"] = "mobile-navigation-router-offboard"
-sdkNameMap["libdirections-onboard"] = "mobile-navigation-router-onboard"
+sdkNameMap["libnavigation-router"] = "mobile-navigation-router"
 sdkNameMap["libnavigation-util"] = "mobile-navigation-utils"
 sdkNameMap["libnavigation-ui"] = "mobile-navigation-ui"