From c6dcaf5f6c46c975aceeac006740592bfc6b1c5a Mon Sep 17 00:00:00 2001 From: Pablo Guardiola Date: Tue, 19 May 2020 20:09:17 -0400 Subject: [PATCH] ship with java 8 bytecode --- LICENSE.md | 54 +++++++++++++++++++++++++++++ build.gradle | 8 +++++ carbon/build.gradle | 5 +++ gradle/dependencies.gradle | 2 +- libdirections-hybrid/build.gradle | 5 +++ libdirections-offboard/build.gradle | 5 +++ libdirections-onboard/build.gradle | 5 +++ libnavigation-base/build.gradle | 5 +++ libnavigation-core/build.gradle | 5 +++ libnavigation-metrics/build.gradle | 5 +++ libnavigation-util/build.gradle | 5 +++ libnavigator/build.gradle | 5 +++ libnavui-alert/build.gradle | 5 +++ libnavui-base/build.gradle | 5 +++ libnavui-feedback/build.gradle | 5 +++ libnavui-guidance/build.gradle | 5 +++ libnavui-maps/build.gradle | 5 +++ libnavui-summary/build.gradle | 5 +++ libnavui-util/build.gradle | 5 +++ libnavui-voice/build.gradle | 5 +++ libtesting-ui/build.gradle | 5 +++ libtesting-utils/build.gradle | 5 +++ libtrip-notification/build.gradle | 5 +++ 23 files changed, 163 insertions(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 5bb4dce2bb1..d5ef163da7e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -277,6 +277,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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) @@ -659,6 +665,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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) + +=========================================================================== + @@ -725,6 +737,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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) @@ -799,6 +817,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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) + +=========================================================================== + @@ -851,6 +875,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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) + +=========================================================================== + @@ -933,6 +963,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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) + +=========================================================================== + @@ -1085,6 +1121,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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 VersionedParcelable and friends (Provides a stable but relatively compact binary serialization format that can be passed across processes or persisted safely.). 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) @@ -1149,6 +1191,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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 support. License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -1231,6 +1279,12 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== +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 VersionedParcelable (Provides a stable but relatively compact binary serialization format that can be passed across processes or persisted safely.). 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) diff --git a/build.gradle b/build.gradle index d8f6fe16730..beb3cac3437 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,14 @@ subprojects { dependencies { errorprone dependenciesList.errorprone } + + plugins.withId('org.jetbrains.kotlin.jvm') { + compileKotlin { + kotlinOptions { + jvmTarget = "1.8" + } + } + } } task clean(type: Delete) { diff --git a/carbon/build.gradle b/carbon/build.gradle index d163565d948..a3a1c61c488 100644 --- a/carbon/build.gradle +++ b/carbon/build.gradle @@ -7,6 +7,11 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.2" + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { applicationId "com.mapbox.carbon.testapp" minSdkVersion 19 diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 8d76d140533..ec02af72dff 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -85,7 +85,7 @@ ext { mapboxLogger : "com.mapbox.common:logger:${version.mapboxLogger}", // Kotlin - kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${version.kotlinStdLib}", + kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${version.kotlinStdLib}", ankoCommon : "org.jetbrains.anko:anko-common:${version.ankoCommon}", // Coroutines and Channels diff --git a/libdirections-hybrid/build.gradle b/libdirections-hybrid/build.gradle index e79665da4b4..a0aed2414ec 100644 --- a/libdirections-hybrid/build.gradle +++ b/libdirections-hybrid/build.gradle @@ -18,6 +18,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libdirections-offboard/build.gradle b/libdirections-offboard/build.gradle index be6282cf556..41ef53d823c 100644 --- a/libdirections-offboard/build.gradle +++ b/libdirections-offboard/build.gradle @@ -18,6 +18,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libdirections-onboard/build.gradle b/libdirections-onboard/build.gradle index 2ebe12d7c78..cf9c94514e5 100644 --- a/libdirections-onboard/build.gradle +++ b/libdirections-onboard/build.gradle @@ -18,6 +18,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavigation-base/build.gradle b/libnavigation-base/build.gradle index 29e78498182..fd8a125d240 100644 --- a/libnavigation-base/build.gradle +++ b/libnavigation-base/build.gradle @@ -26,6 +26,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavigation-core/build.gradle b/libnavigation-core/build.gradle index 6289c0f5f8d..55f5bb82d88 100644 --- a/libnavigation-core/build.gradle +++ b/libnavigation-core/build.gradle @@ -24,6 +24,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavigation-metrics/build.gradle b/libnavigation-metrics/build.gradle index 76ec13689cf..b5b133ecbef 100644 --- a/libnavigation-metrics/build.gradle +++ b/libnavigation-metrics/build.gradle @@ -22,6 +22,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavigation-util/build.gradle b/libnavigation-util/build.gradle index bdf9442f000..1ec0403bd20 100644 --- a/libnavigation-util/build.gradle +++ b/libnavigation-util/build.gradle @@ -22,6 +22,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavigator/build.gradle b/libnavigator/build.gradle index d59ac2d66a6..aa1cec3acd2 100644 --- a/libnavigator/build.gradle +++ b/libnavigator/build.gradle @@ -22,6 +22,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-alert/build.gradle b/libnavui-alert/build.gradle index c3c8e783aca..945f2685b3b 100644 --- a/libnavui-alert/build.gradle +++ b/libnavui-alert/build.gradle @@ -21,6 +21,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-base/build.gradle b/libnavui-base/build.gradle index ae25a61b5ad..e57a2bd0468 100644 --- a/libnavui-base/build.gradle +++ b/libnavui-base/build.gradle @@ -22,6 +22,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-feedback/build.gradle b/libnavui-feedback/build.gradle index 24e7fee53cc..89b3cc25471 100644 --- a/libnavui-feedback/build.gradle +++ b/libnavui-feedback/build.gradle @@ -21,6 +21,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-guidance/build.gradle b/libnavui-guidance/build.gradle index 24e7fee53cc..89b3cc25471 100644 --- a/libnavui-guidance/build.gradle +++ b/libnavui-guidance/build.gradle @@ -21,6 +21,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-maps/build.gradle b/libnavui-maps/build.gradle index d5a03db0446..e0aa0f5d097 100644 --- a/libnavui-maps/build.gradle +++ b/libnavui-maps/build.gradle @@ -22,6 +22,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-summary/build.gradle b/libnavui-summary/build.gradle index 24e7fee53cc..89b3cc25471 100644 --- a/libnavui-summary/build.gradle +++ b/libnavui-summary/build.gradle @@ -21,6 +21,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-util/build.gradle b/libnavui-util/build.gradle index b6b0f086e75..5aab4572474 100644 --- a/libnavui-util/build.gradle +++ b/libnavui-util/build.gradle @@ -21,6 +21,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libnavui-voice/build.gradle b/libnavui-voice/build.gradle index bd013234971..f9da77e554d 100644 --- a/libnavui-voice/build.gradle +++ b/libnavui-voice/build.gradle @@ -21,6 +21,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libtesting-ui/build.gradle b/libtesting-ui/build.gradle index 97d61208911..356f808ded4 100644 --- a/libtesting-ui/build.gradle +++ b/libtesting-ui/build.gradle @@ -5,6 +5,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libtesting-utils/build.gradle b/libtesting-utils/build.gradle index 8a12c08ace5..58577c2b285 100644 --- a/libtesting-utils/build.gradle +++ b/libtesting-utils/build.gradle @@ -5,6 +5,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/libtrip-notification/build.gradle b/libtrip-notification/build.gradle index 7d56f0a8303..732821fbf3a 100644 --- a/libtrip-notification/build.gradle +++ b/libtrip-notification/build.gradle @@ -23,6 +23,11 @@ android { compileSdkVersion androidVersions.compileSdkVersion buildToolsVersion androidVersions.buildToolsVersion + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion