Bug 1820233 - Remove unneeded kotlin_stdlib inclusions and re-enable Werror in detekt build.gradle

fenix/112.0
Ryan VanderMeulen 1 year ago committed by mergify[bot]
parent 0cbed434ec
commit fcd5d5c6ae

@ -484,7 +484,6 @@ dependencies {
implementation project(':browser-engine-gecko')
implementation FenixDependencies.kotlin_stdlib
implementation FenixDependencies.kotlin_coroutines
implementation FenixDependencies.kotlin_coroutines_android
testImplementation FenixDependencies.kotlin_coroutines_test

@ -65,8 +65,6 @@ object FenixDependencies {
const val tools_androidgradle = "com.android.tools.build:gradle:${FenixVersions.android_gradle_plugin}"
const val tools_kotlingradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:${FenixVersions.kotlin}"
const val tools_benchmarkgradle = "androidx.benchmark:benchmark-gradle-plugin:${FenixVersions.androidx_benchmark}"
const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${FenixVersions.kotlin}"
const val kotlin_stdlib_jdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${FenixVersions.kotlin}"
const val kotlin_reflect = "org.jetbrains.kotlin:kotlin-reflect:${FenixVersions.kotlin}"
const val kotlin_coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${FenixVersions.coroutines}"
const val kotlin_coroutines_test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${FenixVersions.coroutines}"

@ -4,11 +4,6 @@ dependencies {
compileOnly FenixDependencies.detektApi
implementation FenixDependencies.androidx_annotation
// I didn't look thoroughly enough to really know what's going on here but I think
// the detekt API uses jdk8 so if we provide jdk7, the dependency collision system
// doesn't work and there are duplicate APIs with different versions in the output.
implementation FenixDependencies.kotlin_stdlib_jdk8
testImplementation FenixDependencies.detektApi
testImplementation FenixDependencies.detektTest
testImplementation FenixDependencies.junitApi

@ -21,17 +21,6 @@ repositories {
}
dependencies {
// I didn't look thoroughly enough to really know what's going on here but I think
// the lint API uses jdk8 so if we provide jdk7, the dependency collision system
// doesn't work and there are duplicate APIs with different versions in the output.
//
// The prepareLintJar task fails with "Found more than one jar in the 'lintChecks' configuration"
// if we include the stdlib (with implementation) so we have to do compileOnly + testImplementation.
compileOnly FenixDependencies.kotlin_stdlib_jdk8
compileOnly FenixDependencies.kotlin_reflect
testImplementation FenixDependencies.kotlin_stdlib_jdk8
testImplementation FenixDependencies.kotlin_reflect
compileOnly "com.android.tools.lint:lint-api:${FenixVersions.android_lint_api}"
compileOnly "com.android.tools.lint:lint-checks:${FenixVersions.android_lint_api}"

Loading…
Cancel
Save