Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 2fd4ecb4 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #10094 from liutikas/fixwarnings

Fix warnings in build-plugin
parents 9cacd919 1446070b
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ dependencies {
    implementation(platform(libs.kotlin.gradle.bom))
}

kotlin {
    compilerOptions {
        allWarningsAsErrors = true
    }
}

fun plugin(provider: Provider<PluginDependency>) = with(provider.get()) {
    "$pluginId:$pluginId.gradle.plugin:$version"
}
+6 −4
Original line number Diff line number Diff line
@@ -20,16 +20,18 @@ android {
        isCoreLibraryDesugaringEnabled = true
    }

    kotlinOptions {
        jvmTarget = ThunderbirdProjectConfig.Compiler.javaCompatibility.toString()
    }

    dependenciesInfo {
        includeInApk = false
        includeInBundle = false
    }
}

kotlin {
    compilerOptions {
        jvmTarget = ThunderbirdProjectConfig.Compiler.jvmTarget
    }
}

dependencies {
    coreLibraryDesugaring(libs.android.desugar.nio)

+3 −1
Original line number Diff line number Diff line
import com.android.build.api.variant.HostTestBuilder

plugins {
    id("thunderbird.library.android")
    id("org.jetbrains.kotlin.plugin.compose")
@@ -12,7 +14,7 @@ android {

androidComponents {
    beforeVariants(selector().withBuildType("release")) { variantBuilder ->
        variantBuilder.enableUnitTest = false
        variantBuilder.hostTests[HostTestBuilder.UNIT_TEST_TYPE]?.enable = false
        variantBuilder.enableAndroidTest = false
    }
}
+3 −4
Original line number Diff line number Diff line
@@ -11,13 +11,12 @@ android {
    buildFeatures {
        buildConfig = false
    }

    kotlinOptions {
        jvmTarget = ThunderbirdProjectConfig.Compiler.javaCompatibility.toString()
    }
}

kotlin {
    compilerOptions {
        jvmTarget.set(ThunderbirdProjectConfig.Compiler.jvmTarget)
    }
    sourceSets.all {
        compilerOptions {
            freeCompilerArgs.add("-Xwhen-guards")