atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Extract Jacoco setup to plugin

Browse Source
This commit is contained in:
Kirill Kamakin
2022-08-03 20:26:21 +02:00
parent 4d53b10db0
commit a21e4d395a
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle.kts
View File

@@ -4,7 +4,6 @@ import com.google.protobuf.gradle.builtins
import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.generateProtoTasks
import com.google.protobuf.gradle.protobuf import com.google.protobuf.gradle.protobuf
import com.google.protobuf.gradle.protoc import com.google.protobuf.gradle.protoc
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.FileInputStream import java.io.FileInputStream
import java.util.* import java.util.*
@@ -107,19 +106,6 @@ android {
} }
} }
tasks.withType<Test>().configureEach {
configure<JacocoTaskExtension> {
isIncludeNoLocationClasses = true
excludes = listOf("jdk.internal.*")
}
}
tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
}
dependencies { dependencies {
implementation(libs.android.material.material) implementation(libs.android.material.material)

11
build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/KotlinAndroid.kt
View File

@@ -5,7 +5,11 @@ package gq.kirmanak.mealient
import com.android.build.api.dsl.CommonExtension import com.android.build.api.dsl.CommonExtension
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.ExtensionAware import org.gradle.api.plugins.ExtensionAware
import org.gradle.api.tasks.testing.Test
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.withType
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
internal fun Project.configureKotlinAndroid( internal fun Project.configureKotlinAndroid(
@@ -30,6 +34,13 @@ internal fun Project.configureKotlinAndroid(
add("coreLibraryDesugaring", libs.findLibrary("android-tools-desugar").get()) add("coreLibraryDesugaring", libs.findLibrary("android-tools-desugar").get())
} }
} }
tasks.withType<Test>().configureEach {
configure<JacocoTaskExtension> {
isIncludeNoLocationClasses = true
excludes = listOf("jdk.internal.*")
}
}
} }
fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {