diff --git a/README.md b/README.md index 071c9dfe..c42296dd 100644 --- a/README.md +++ b/README.md @@ -15,22 +15,23 @@ Kover Toolset: - [Kover features artifact](#kover-features-artifact) ## Kover Gradle Plugin -For full information about latest stable release of Kover Gradle Plugin, please refer to the [documentation](https://kotlin.github.io/kotlinx-kover/gradle-plugin). +For full information about the latest stable release of Kover Gradle Plugin, please refer to the [documentation](https://kotlin.github.io/kotlinx-kover/gradle-plugin). ### Features -* Collection of code coverage through `JVM` tests (JS and native targets are not supported yet). +* Collection of code coverage for JVM and Android host tests (JS and native targets are not supported yet). * Generating `HTML` and `XML` reports. -* Support for `Kotlin JVM`, `Kotlin Multiplatform` projects. -* Support for `Kotlin Android` projects with build variants (instrumentation tests executing on the Android device are not supported yet). -* Support mixed `Kotlin` and `Java` sources +* Works with `kotlin("jvm")`, `kotlin("android")`, `kotlin("multiplatform")` and `com.android.kotlin.multiplatform.library` plugins. +* Support build variants in `kotlin("android")` projects. +* Support mixed `Kotlin` and `Java` sources. * Verification rules with bounds in the Gradle plugin to keep track of coverage. * Using JaCoCo library in Gradle plugin as an alternative for coverage measuring and report generation. The recommended way of applying Kover is with the [plugins DSL](https://docs.gradle.org/current/userguide/plugins.html#sec:plugins_block). -Minimum supported version of `Gradle` is `6.8`. +Minimum supported version of `Gradle` is `6.8.3`. +Minimum version of JVM for running tests is `1.7`. Add the following to your top-level build file: @@ -121,6 +122,8 @@ It is in its infancy, it is recommended to use it only for test or pet projects. Refer to the [documentation](https://kotlin.github.io/kotlinx-kover/gradle-plugin/aggregated.html) for details. ## Kover Maven Plugin +Minimum Maven version for Maven plugin is `3.0` + The Kover Maven Plugin can be applied by specifying build plugin ```xml @@ -132,10 +135,12 @@ The Kover Maven Plugin can be applied by specifying build plugin The list of Kover goals is specified in [this document section](https://kotlin.github.io/kotlinx-kover/maven-plugin#goals). -For full information about latest stable release of Kover Maven Plugin, please refer to the [documentation](https://kotlin.github.io/kotlinx-kover/maven-plugin). +For full information about the latest stable release of Kover Maven Plugin, please refer to the [documentation](https://kotlin.github.io/kotlinx-kover/maven-plugin). ## Kover CLI +Minimum version of JVM is `1.8`. + Standalone JVM application used for offline instrumentation and generation of human-readable reports. [Documentation of the Kover CLI](https://kotlin.github.io/kotlinx-kover/cli). @@ -146,11 +151,16 @@ Offline instrumentation is the modification of class-files stored on disk to mea The ways of offline instrumentation and running of the instrumented applications are described in the [documentation](https://kotlin.github.io/kotlinx-kover/offline-instrumentation). ## Kover JVM agent +Minimum version of JVM is `1.7`. + JVM agent is a jar file that modifies the bytecode of loaded into the JVM classes in order to measure coverage. [Documentations](https://kotlin.github.io/kotlinx-kover/jvm-agent). ## Kover features artifact -A JVM dependency that allows to programmatically instrument class-files on a disk. +Minimum version of JVM is `1.8`. +Minimum version of Kotlin is `1.8.0`. + +A JVM dependency that allows programmatically instrument class-files on a disk. [Documentation of Kover features artifact](https://kotlin.github.io/kotlinx-kover/offline-instrumentation/#instrumentation-by-kover-features) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8bc04a3..ed1b01d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] intellij-coverage = "1.0.765" -junit = "5.9.0" +junit = "5.13.4" kotlinx-bcv = "0.13.2" -kotlinx-dokka = "1.8.10" +kotlinx-dokka = "2.0.0" args4j = "2.33" gradle-plugin-publish = "1.2.1" -maven-plugin-development = "0.4.3" +maven-plugin-development = "1.0.3" maven-embedder = "3.9.8" maven-api = "3.0" maven-resolver = "1.9.21" @@ -47,5 +47,5 @@ jacoco-reporter = {module = "org.jacoco:org.jacoco.report", version.ref = "jacoc gradle-pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" } kotlinx-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-bcv" } kotlinx-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlinx-dokka" } -mavenPluginDevelopment = { id = "de.benediktritter.maven-plugin-development", version.ref = "maven-plugin-development" } +mavenPluginDevelopment = { id = "org.gradlex.maven-plugin-development", version.ref = "maven-plugin-development" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..8bdaf60c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..2e111328 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b..adff685a 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -205,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c..e509b2dd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/kover-features-jvm/build.gradle.kts b/kover-features-jvm/build.gradle.kts index f2cef501..6b25f323 100644 --- a/kover-features-jvm/build.gradle.kts +++ b/kover-features-jvm/build.gradle.kts @@ -44,8 +44,8 @@ afterEvaluate { compilerOptions { allWarningsAsErrors = true jvmTarget = JvmTarget.JVM_1_8 - languageVersion = KotlinVersion.KOTLIN_1_5 - apiVersion = KotlinVersion.KOTLIN_1_5 + languageVersion = KotlinVersion.KOTLIN_1_8 + apiVersion = KotlinVersion.KOTLIN_1_8 freeCompilerArgs.addAll("-Xsuppress-version-warnings") } } diff --git a/kover-gradle-plugin/build.gradle.kts b/kover-gradle-plugin/build.gradle.kts index 0fa131e1..30e0c357 100644 --- a/kover-gradle-plugin/build.gradle.kts +++ b/kover-gradle-plugin/build.gradle.kts @@ -51,6 +51,7 @@ dependencies { functionalTestImplementation(kotlin("test")) functionalTestImplementation(libs.junit.jupiter) functionalTestImplementation(libs.junit.params) + "functionalTestRuntimeOnly"("org.junit.platform:junit-platform-launcher") snapshotRelease(projects.koverFeaturesJvm) snapshotRelease(projects.koverJvmAgent) @@ -60,7 +61,6 @@ dependencies { functionalTestImplementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$embeddedKotlinVersion") functionalTestImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:$embeddedKotlinVersion") functionalTestImplementation("org.jetbrains.kotlin:kotlin-compiler-runner:$embeddedKotlinVersion") - } kotlin { @@ -163,8 +163,8 @@ afterEvaluate { compilerOptions { allWarningsAsErrors = true jvmTarget = JvmTarget.JVM_1_8 - languageVersion = KotlinVersion.KOTLIN_1_5 - apiVersion = KotlinVersion.KOTLIN_1_5 + languageVersion = KotlinVersion.KOTLIN_1_8 + apiVersion = KotlinVersion.KOTLIN_1_8 freeCompilerArgs.add("-Xsuppress-version-warnings") } } @@ -183,8 +183,8 @@ tasks.dokkaHtml { skipDeprecated = true } sourceLink { - localDirectory = rootDir - remoteUrl = URL("https://github.com/kotlin/kotlinx-kover/tree/main") + localDirectory.set(file(rootDir)) + remoteUrl.set(URL("https://github.com/kotlin/kotlinx-kover/tree/main")) remoteLineSuffix = "#L" } } diff --git a/kover-gradle-plugin/examples/android/dynamic/build.gradle.kts b/kover-gradle-plugin/examples/android/dynamic/build.gradle.kts index 05788c5a..32770e57 100644 --- a/kover-gradle-plugin/examples/android/dynamic/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/dynamic/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false id ("com.android.dynamic-feature") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" apply false } diff --git a/kover-gradle-plugin/examples/android/flavors/build.gradle.kts b/kover-gradle-plugin/examples/android/flavors/build.gradle.kts index 78631787..3e188a69 100644 --- a/kover-gradle-plugin/examples/android/flavors/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/flavors/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" apply false } diff --git a/kover-gradle-plugin/examples/android/minimal_groovy/app/build.gradle b/kover-gradle-plugin/examples/android/minimal_groovy/app/build.gradle index 2df7ced4..5971dc88 100644 --- a/kover-gradle-plugin/examples/android/minimal_groovy/app/build.gradle +++ b/kover-gradle-plugin/examples/android/minimal_groovy/app/build.gradle @@ -11,7 +11,7 @@ android { defaultConfig { applicationId "kotlinx.kover.test.android" minSdk 21 - targetSdk 31 + targetSdk 33 versionCode 1 versionName "1.0" diff --git a/kover-gradle-plugin/examples/android/minimal_groovy/build.gradle b/kover-gradle-plugin/examples/android/minimal_groovy/build.gradle index 4aba2d7f..b556bea7 100644 --- a/kover-gradle-plugin/examples/android/minimal_groovy/build.gradle +++ b/kover-gradle-plugin/examples/android/minimal_groovy/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.android.application' version '7.4.0' apply false - id 'com.android.library' version '7.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.8.20' apply false + id 'com.android.application' version '8.12.0' apply false + id 'com.android.library' version '8.12.0' apply false + id 'org.jetbrains.kotlin.android' version '2.2.20' apply false id 'org.jetbrains.kotlinx.kover' version '0.9.2' apply false } diff --git a/kover-gradle-plugin/examples/android/minimal_kts/app/build.gradle.kts b/kover-gradle-plugin/examples/android/minimal_kts/app/build.gradle.kts index 6837f7dc..cb55bd46 100644 --- a/kover-gradle-plugin/examples/android/minimal_kts/app/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/minimal_kts/app/build.gradle.kts @@ -11,7 +11,7 @@ android { defaultConfig { applicationId = "kotlinx.kover.test.android" minSdk = 21 - targetSdk = 31 + targetSdk = 33 versionCode = 1 versionName = "1.0" diff --git a/kover-gradle-plugin/examples/android/minimal_kts/build.gradle.kts b/kover-gradle-plugin/examples/android/minimal_kts/build.gradle.kts index 78631787..3e188a69 100644 --- a/kover-gradle-plugin/examples/android/minimal_kts/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/minimal_kts/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" apply false } diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/build.gradle.kts b/kover-gradle-plugin/examples/android/multiplatform/app/build.gradle.kts index 7ef410c7..8ffee66a 100644 --- a/kover-gradle-plugin/examples/android/multiplatform/app/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/multiplatform/app/build.gradle.kts @@ -23,6 +23,7 @@ android { isMinifyEnabled = true } } + compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -37,11 +38,11 @@ dependencies { implementation("androidx.appcompat:appcompat:1.5.0") implementation("com.google.android.material:material:1.6.1") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - testImplementation("junit:junit:4.13.2") + commonTestImplementation("junit:junit:4.13.2") } kotlin { - android() + androidTarget() jvm() { testRuns["test"].executionTask.configure { @@ -78,13 +79,12 @@ kover { currentProject { createVariant("custom") { - - add("jvm") /** - * Tests, sources, classes, and compilation tasks of the 'debug' build variant will be included in the report variant `custom`. - * Thus, information from the 'debug' variant will be included in the `custom` report for this project and any project that specifies this project as a dependency. + * Take coverage from this project and any project specified by `kover(project("..."))` dependency */ - addWithDependencies("debug") + addWithDependencies("jvm") + + add("debug") } } diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/debug/kotlin/kotlinx/test/android/DebugAppClass.kt b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidDebug/kotlin/kotlinx/test/android/DebugAppClass.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/debug/kotlin/kotlinx/test/android/DebugAppClass.kt rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidDebug/kotlin/kotlinx/test/android/DebugAppClass.kt diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/AndroidManifest.xml b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/AndroidManifest.xml similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/AndroidManifest.xml rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/AndroidManifest.xml diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/java/kotlinx/kover/test/android/DebugUtil.kt b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/kotlin/kotlinx/kover/test/android/DebugUtil.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/java/kotlinx/kover/test/android/DebugUtil.kt rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/kotlin/kotlinx/kover/test/android/DebugUtil.kt diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/java/kotlinx/kover/test/android/MainActivity.kt b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/kotlin/kotlinx/kover/test/android/MainActivity.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/java/kotlinx/kover/test/android/MainActivity.kt rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/kotlin/kotlinx/kover/test/android/MainActivity.kt diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/java/kotlinx/kover/test/android/Maths.kt b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/kotlin/kotlinx/kover/test/android/Maths.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/java/kotlinx/kover/test/android/Maths.kt rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/kotlin/kotlinx/kover/test/android/Maths.kt diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/layout/activity_main.xml b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/layout/activity_main.xml similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/layout/activity_main.xml rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/layout/activity_main.xml diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/values/colors.xml b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/values/colors.xml similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/values/colors.xml rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/values/colors.xml diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/values/strings.xml b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/values/strings.xml similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/values/strings.xml rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/values/strings.xml diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/values/themes.xml b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/values/themes.xml similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/main/res/values/themes.xml rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidMain/res/values/themes.xml diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/test/java/kotlinx/kover/test/android/LocalTests.kt b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidUnitTest/kotlin/android/LocalTests.kt similarity index 82% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/test/java/kotlinx/kover/test/android/LocalTests.kt rename to kover-gradle-plugin/examples/android/multiplatform/app/src/androidUnitTest/kotlin/android/LocalTests.kt index c6453c26..ff39768d 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/test/java/kotlinx/kover/test/android/LocalTests.kt +++ b/kover-gradle-plugin/examples/android/multiplatform/app/src/androidUnitTest/kotlin/android/LocalTests.kt @@ -1,5 +1,6 @@ package kotlinx.kover.test.android +import kotlinx.kover.test.android.Maths import org.junit.Test import org.junit.Assert.* diff --git a/kover-gradle-plugin/examples/android/multiplatform/build.gradle.kts b/kover-gradle-plugin/examples/android/multiplatform/build.gradle.kts index cce89e93..01505ea3 100644 --- a/kover-gradle-plugin/examples/android/multiplatform/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/multiplatform/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - kotlin("multiplatform") version ("1.8.20") apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.kotlin.multiplatform.library") version "8.12.0" apply false + kotlin("multiplatform") version ("2.2.20") apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" } diff --git a/kover-gradle-plugin/examples/android/multiplatform/lib/build.gradle.kts b/kover-gradle-plugin/examples/android/multiplatform/lib/build.gradle.kts index 207d3fdd..7a1fe878 100644 --- a/kover-gradle-plugin/examples/android/multiplatform/lib/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/multiplatform/lib/build.gradle.kts @@ -1,45 +1,34 @@ plugins { - id ("com.android.library") + id("com.android.kotlin.multiplatform.library") kotlin("multiplatform") id ("org.jetbrains.kotlinx.kover") } -android { - namespace = "kotlinx.kover.test.android" - - compileSdk = 32 - - defaultConfig { - minSdk = 21 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - isMinifyEnabled = true +kotlin { + androidLibrary { + namespace = "kotlinx.kover.test.android" + compileSdk = 33 + minSdk = 24 + + withJava() + withDeviceTestBuilder { + sourceSetTreeName = "test" } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + + withHostTest { } } } -kotlin { - jvmToolchain(8) - android() -} dependencies { - implementation("androidx.core:core-ktx:1.8.0") - implementation("androidx.appcompat:appcompat:1.5.0") - testImplementation("junit:junit:4.13.2") + commonTestImplementation("junit:junit:4.13.2") } -kover { +kover { currentProject { - createVariant("custom") { } + createVariant("custom") { + add("jvm") + } } } diff --git a/kover-gradle-plugin/examples/android/multiplatform/lib/src/main/java/kotlinx/kover/test/android/lib/DebugUtil.kt b/kover-gradle-plugin/examples/android/multiplatform/lib/src/androidMain/kotlin/kotlinx/kover/test/android/lib/DebugUtil.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/lib/src/main/java/kotlinx/kover/test/android/lib/DebugUtil.kt rename to kover-gradle-plugin/examples/android/multiplatform/lib/src/androidMain/kotlin/kotlinx/kover/test/android/lib/DebugUtil.kt diff --git a/kover-gradle-plugin/examples/android/multiplatform/lib/src/main/java/kotlinx/kover/test/android/lib/MagicFactory.kt b/kover-gradle-plugin/examples/android/multiplatform/lib/src/androidMain/kotlin/kotlinx/kover/test/android/lib/MagicFactory.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/lib/src/main/java/kotlinx/kover/test/android/lib/MagicFactory.kt rename to kover-gradle-plugin/examples/android/multiplatform/lib/src/androidMain/kotlin/kotlinx/kover/test/android/lib/MagicFactory.kt diff --git a/kover-gradle-plugin/examples/android/multiplatform/lib/src/test/java/kotlinx/kover/test/android/LocalLibTests.kt b/kover-gradle-plugin/examples/android/multiplatform/lib/src/commonTest/kotlin/kotlinx/kover/test/android/LocalLibTests.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/lib/src/test/java/kotlinx/kover/test/android/LocalLibTests.kt rename to kover-gradle-plugin/examples/android/multiplatform/lib/src/commonTest/kotlin/kotlinx/kover/test/android/LocalLibTests.kt diff --git a/kover-gradle-plugin/examples/android/multiplatform/lib/src/debug/kotlin/kotlinx/test/android/lib/DebugLibClass.kt b/kover-gradle-plugin/examples/android/multiplatform/lib/src/debug/kotlin/kotlinx/test/android/lib/DebugLibClass.kt deleted file mode 100644 index 5897a5e2..00000000 --- a/kover-gradle-plugin/examples/android/multiplatform/lib/src/debug/kotlin/kotlinx/test/android/lib/DebugLibClass.kt +++ /dev/null @@ -1,7 +0,0 @@ -package kotlinx.kover.test.android.lib - -object DebugLibClass { - fun foo() { - println("LIB DEBUG") - } -} \ No newline at end of file diff --git a/kover-gradle-plugin/examples/android/multiplatform/lib/src/main/AndroidManifest.xml b/kover-gradle-plugin/examples/android/multiplatform/lib/src/main/AndroidManifest.xml deleted file mode 100644 index 30649270..00000000 --- a/kover-gradle-plugin/examples/android/multiplatform/lib/src/main/AndroidManifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/kover-gradle-plugin/examples/android/multiproject-custom/build.gradle.kts b/kover-gradle-plugin/examples/android/multiproject-custom/build.gradle.kts index b741f538..4df5cdec 100644 --- a/kover-gradle-plugin/examples/android/multiproject-custom/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/multiproject-custom/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" } diff --git a/kover-gradle-plugin/examples/android/multiproject/app/build.gradle.kts b/kover-gradle-plugin/examples/android/multiproject/app/build.gradle.kts index 7b55c52c..4b87c0c1 100644 --- a/kover-gradle-plugin/examples/android/multiproject/app/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/multiproject/app/build.gradle.kts @@ -11,7 +11,7 @@ android { defaultConfig { applicationId = "kotlinx.kover.test.android" minSdk = 21 - targetSdk = 31 + targetSdk = 33 versionCode = 1 versionName = "1.0" diff --git a/kover-gradle-plugin/examples/android/multiproject/build.gradle.kts b/kover-gradle-plugin/examples/android/multiproject/build.gradle.kts index 78631787..3e188a69 100644 --- a/kover-gradle-plugin/examples/android/multiproject/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/multiproject/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" apply false } diff --git a/kover-gradle-plugin/examples/android/multiproject/lib/build.gradle.kts b/kover-gradle-plugin/examples/android/multiproject/lib/build.gradle.kts index 4f29288f..bdceaac4 100644 --- a/kover-gradle-plugin/examples/android/multiproject/lib/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/multiproject/lib/build.gradle.kts @@ -17,7 +17,7 @@ android { buildTypes { release { - isMinifyEnabled = true + isMinifyEnabled = false } } compileOptions { diff --git a/kover-gradle-plugin/examples/android/multiproject/lib/src/main/java/kotlinx/kover/test/android/lib/DebugUtil.kt b/kover-gradle-plugin/examples/android/multiproject/lib/src/main/kotlin/kotlinx/kover/test/android/lib/DebugUtil.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiproject/lib/src/main/java/kotlinx/kover/test/android/lib/DebugUtil.kt rename to kover-gradle-plugin/examples/android/multiproject/lib/src/main/kotlin/kotlinx/kover/test/android/lib/DebugUtil.kt diff --git a/kover-gradle-plugin/examples/android/multiproject/lib/src/main/java/kotlinx/kover/test/android/lib/MagicFactory.kt b/kover-gradle-plugin/examples/android/multiproject/lib/src/main/kotlin/kotlinx/kover/test/android/lib/MagicFactory.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiproject/lib/src/main/java/kotlinx/kover/test/android/lib/MagicFactory.kt rename to kover-gradle-plugin/examples/android/multiproject/lib/src/main/kotlin/kotlinx/kover/test/android/lib/MagicFactory.kt diff --git a/kover-gradle-plugin/examples/android/variantUsage/build.gradle.kts b/kover-gradle-plugin/examples/android/variantUsage/build.gradle.kts index 78631787..3e188a69 100644 --- a/kover-gradle-plugin/examples/android/variantUsage/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/variantUsage/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" apply false } diff --git a/kover-gradle-plugin/examples/android/with-jvm/build.gradle.kts b/kover-gradle-plugin/examples/android/with-jvm/build.gradle.kts index 6b82546b..a95ba60a 100644 --- a/kover-gradle-plugin/examples/android/with-jvm/build.gradle.kts +++ b/kover-gradle-plugin/examples/android/with-jvm/build.gradle.kts @@ -1,8 +1,8 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - kotlin("android") version "1.8.20" apply false - kotlin("jvm") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + kotlin("android") version ("2.2.20") apply false + kotlin("jvm") version ("2.2.20") apply false id("org.jetbrains.kotlinx.kover") version "0.9.2" } diff --git a/kover-gradle-plugin/examples/jvm/copy-variant/build.gradle.kts b/kover-gradle-plugin/examples/jvm/copy-variant/build.gradle.kts index d19cfe5d..95d29b6f 100644 --- a/kover-gradle-plugin/examples/jvm/copy-variant/build.gradle.kts +++ b/kover-gradle-plugin/examples/jvm/copy-variant/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") version "0.9.2" } diff --git a/kover-gradle-plugin/examples/jvm/merged/build.gradle.kts b/kover-gradle-plugin/examples/jvm/merged/build.gradle.kts index 5ea643b0..3d8e7109 100644 --- a/kover-gradle-plugin/examples/jvm/merged/build.gradle.kts +++ b/kover-gradle-plugin/examples/jvm/merged/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") version "0.9.2" } diff --git a/kover-gradle-plugin/examples/jvm/single-kmp/build.gradle.kts b/kover-gradle-plugin/examples/jvm/single-kmp/build.gradle.kts index 6aa58e94..72db34f6 100644 --- a/kover-gradle-plugin/examples/jvm/single-kmp/build.gradle.kts +++ b/kover-gradle-plugin/examples/jvm/single-kmp/build.gradle.kts @@ -1,11 +1,10 @@ plugins { - kotlin("multiplatform") version "1.9.20" + kotlin("multiplatform") version ("2.2.20") id("org.jetbrains.kotlinx.kover") version "0.9.2" } kotlin { jvm { - withJava() } } diff --git a/kover-gradle-plugin/examples/jvm/single/build.gradle.kts b/kover-gradle-plugin/examples/jvm/single/build.gradle.kts index 620a8fb2..616c183a 100644 --- a/kover-gradle-plugin/examples/jvm/single/build.gradle.kts +++ b/kover-gradle-plugin/examples/jvm/single/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") version "0.9.2" } diff --git a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/AccessorsTests.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/AccessorsTests.kt index e66e831d..915890e8 100644 --- a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/AccessorsTests.kt +++ b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/AccessorsTests.kt @@ -19,7 +19,7 @@ internal class AccessorsTests { dir.resolve("build.gradle.kts").writeText( """ plugins { - kotlin("jvm") version "1.8.0" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/SettingsPluginTests.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/SettingsPluginTests.kt index 7b38ba13..0638ba58 100644 --- a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/SettingsPluginTests.kt +++ b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/SettingsPluginTests.kt @@ -133,8 +133,8 @@ Rule violated: lines covered percentage is 50.000000, but expected maximum is 10 fun CheckerContext.testVerifyMin() { taskOutput("koverVerify") { assertTrue(contains("Rule 'CLI parameters' violated:\n" + - " lines covered percentage is 7.407400, but expected maximum is 5\n" + - " lines covered percentage is 7.407400, but expected minimum is 100")) + " lines covered percentage is 8.000000, but expected maximum is 5\n" + + " lines covered percentage is 8.000000, but expected minimum is 100")) } } diff --git a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/TaskInterfacesTests.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/TaskInterfacesTests.kt index a4d03b6b..6a7b6f5a 100644 --- a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/TaskInterfacesTests.kt +++ b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/TaskInterfacesTests.kt @@ -23,7 +23,7 @@ internal class TaskInterfacesTests { import kotlinx.kover.gradle.plugin.dsl.tasks.KoverHtmlReport plugins { - kotlin("jvm") version "1.9.22" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } @@ -53,7 +53,7 @@ internal class TaskInterfacesTests { import kotlinx.kover.gradle.plugin.dsl.tasks.KoverHtmlReport plugins { - kotlin("jvm") version "1.9.22" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/VariantUsageTests.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/VariantUsageTests.kt index 9c785e11..ee6ccf3e 100644 --- a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/VariantUsageTests.kt +++ b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/VariantUsageTests.kt @@ -34,16 +34,17 @@ internal class VariantUsageTests { xmlReport("custom") { // check test tasks checkOutcome(":app:testDebugUnitTest", "SUCCESS") - checkOutcome(":lib:testDebugUnitTest", "SUCCESS") + // fixme: fix support for android multiplatform library +// checkOutcome(":lib:testAndroidHostTest", "SUCCESS") // check artifact generation tasks - checkOutcome(":lib:koverGenerateArtifactDebug", "SUCCESS") + checkOutcome(":lib:koverGenerateArtifactJvm", "SUCCESS") checkOutcome(":app:koverGenerateArtifactDebug", "SUCCESS") checkOutcome(":app:koverGenerateArtifactCustom", "SUCCESS") // check android classes from :lib - classCounter("kotlinx.kover.test.android.lib.DebugUtil").assertFullyCovered() - classCounter("kotlinx.kover.test.android.lib.DebugLibClass").assertFullyMissed() + // fixme: fix support for android multiplatform library +// classCounter("kotlinx.kover.test.android.lib.DebugUtil").assertFullyCovered() // check android classes from :app classCounter("kotlinx.kover.test.android.DebugUtil").assertFullyCovered() classCounter("kotlinx.kover.test.android.DebugAppClass").assertFullyMissed() diff --git a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/configurator/ConfiguratorTypes.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/configurator/ConfiguratorTypes.kt index 6e29cb7b..e5e6688d 100644 --- a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/configurator/ConfiguratorTypes.kt +++ b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/configurator/ConfiguratorTypes.kt @@ -126,7 +126,7 @@ private class FilePropertyFromBuildDir(private val relativePath: String): Regula throw KoverCriticalException("Operation not supported in functional test") } - override fun map(transformer: Transformer): Provider { + override fun map(transformer: Transformer): Provider { throw KoverCriticalException("Operation not supported in functional test") } @@ -134,7 +134,7 @@ private class FilePropertyFromBuildDir(private val relativePath: String): Regula throw KoverCriticalException("Operation not supported in functional test") } - override fun flatMap(transformer: Transformer?, in RegularFile>): Provider { + override fun flatMap(transformer: Transformer?, in RegularFile>): Provider { throw KoverCriticalException("Operation not supported in functional test") } @@ -150,11 +150,7 @@ private class FilePropertyFromBuildDir(private val relativePath: String): Regula throw KoverCriticalException("Operation not supported in functional test") } - override fun forUseAtConfigurationTime(): Provider { - throw KoverCriticalException("Operation not supported in functional test") - } - - override fun zip( + override fun zip( right: Provider, combiner: BiFunction ): Provider { diff --git a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildScriptWriter.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildScriptWriter.kt index d478b58b..1d2edc96 100644 --- a/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildScriptWriter.kt +++ b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildScriptWriter.kt @@ -102,7 +102,6 @@ dependencies { private const val KOTLIN_MPP_DEPS = """ kotlin { jvm() { - withJava() } dependencies { commonTestImplementation(kotlin("test")) @@ -127,7 +126,6 @@ dependencies { private const val GROOVY_MPP_DEPS = """ kotlin { jvm() { - withJava() } dependencies { commonTestImplementation 'org.jetbrains.kotlin:kotlin-test' diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-class-dup/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-class-dup/build.gradle.kts index 3f9239c0..55aaaf27 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-class-dup/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-class-dup/build.gradle.kts @@ -3,8 +3,8 @@ */ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-common-verify/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-common-verify/build.gradle.kts index c3ef99cd..6e7ae000 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-common-verify/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-common-verify/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/app/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/app/build.gradle.kts index 0fa1e5cd..be614bc5 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/app/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/app/build.gradle.kts @@ -5,6 +5,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.jetbrains.kotlin.android) + alias(libs.plugins.compose.compiler) id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/build.gradle.kts index 50bae32e..34c6b631 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/build.gradle.kts @@ -6,5 +6,6 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false + alias(libs.plugins.compose.compiler) apply false id("org.jetbrains.kotlinx.kover") version "0.8.1" apply false } \ No newline at end of file diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/gradle/libs.versions.toml b/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/gradle/libs.versions.toml index 8d14cd05..5f4ea4e7 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/gradle/libs.versions.toml +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-compose/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -agp = "8.5.0" -kotlin = "1.9.0" +agp = "8.12.0" +kotlin = "2.2.20" coreKtx = "1.13.1" junit = "4.13.2" junitVersion = "1.1.5" @@ -28,4 +28,5 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3" [plugins] android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-inverse-order/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-inverse-order/build.gradle.kts index c3ef99cd..6e7ae000 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-inverse-order/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-inverse-order/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-kmp-library/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-kmp-library/build.gradle.kts index e9a5e6d5..a845fb56 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-kmp-library/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-kmp-library/build.gradle.kts @@ -3,7 +3,7 @@ */ plugins { - kotlin("multiplatform") version "2.2.0" + kotlin("multiplatform") version ("2.2.20") id("com.android.kotlin.multiplatform.library") version "8.12.0" id ("org.jetbrains.kotlinx.kover") version "0.9.1" } @@ -14,7 +14,6 @@ kotlin { compileSdk = 33 minSdk = 24 - withJava() withDeviceTestBuilder { sourceSetTreeName = "test" } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/build.gradle.kts index 9fef995f..77f58988 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id ("org.jetbrains.kotlinx.kover") version "0.7.1" - id ("com.android.application") version "7.4.0" - kotlin("multiplatform") version ("1.8.20") + id ("com.android.application") version "8.12.0" + kotlin("multiplatform") version ("2.2.20") } android { @@ -11,7 +11,7 @@ android { defaultConfig { applicationId = "kotlinx.kover.test.android" minSdk = 21 - targetSdk = 31 + targetSdk = 33 versionCode = 1 versionName = "1.0" @@ -41,7 +41,7 @@ dependencies { } kotlin { - android() + androidTarget() jvm() { testRuns["test"].executionTask.configure { diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/debug/kotlin/kotlinx/test/android/DebugAppClass.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidDebug/kotlin/kotlinx/test/android/DebugAppClass.kt similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/debug/kotlin/kotlinx/test/android/DebugAppClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidDebug/kotlin/kotlinx/test/android/DebugAppClass.kt diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/AndroidManifest.xml b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/AndroidManifest.xml similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/AndroidManifest.xml rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/AndroidManifest.xml diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/java/kotlinx/kover/test/android/DebugUtil.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/java/kotlinx/kover/test/android/DebugUtil.kt similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/java/kotlinx/kover/test/android/DebugUtil.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/java/kotlinx/kover/test/android/DebugUtil.kt diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/java/kotlinx/kover/test/android/MainActivity.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/java/kotlinx/kover/test/android/MainActivity.kt similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/java/kotlinx/kover/test/android/MainActivity.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/java/kotlinx/kover/test/android/MainActivity.kt diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/java/kotlinx/kover/test/android/Maths.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/java/kotlinx/kover/test/android/Maths.kt similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/java/kotlinx/kover/test/android/Maths.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/java/kotlinx/kover/test/android/Maths.kt diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/layout/activity_main.xml b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/layout/activity_main.xml similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/layout/activity_main.xml rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/layout/activity_main.xml diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/values/colors.xml b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/values/colors.xml similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/values/colors.xml rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/values/colors.xml diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/values/strings.xml b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/values/strings.xml similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/values/strings.xml rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/values/strings.xml diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/values/themes.xml b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/values/themes.xml similarity index 100% rename from kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/main/res/values/themes.xml rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidMain/res/values/themes.xml diff --git a/kover-gradle-plugin/examples/android/multiplatform/app/src/test/java/kotlinx/kover/test/android/LocalTests.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidUnitTest/java/kotlinx/kover/test/android/LocalTests.kt similarity index 100% rename from kover-gradle-plugin/examples/android/multiplatform/app/src/test/java/kotlinx/kover/test/android/LocalTests.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/android-mpp-inverse-order/src/androidUnitTest/java/kotlinx/kover/test/android/LocalTests.kt diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-config/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-config/build.gradle.kts index c3ef99cd..6e7ae000 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-config/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-config/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-merge/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-merge/build.gradle.kts index c3ef99cd..6e7ae000 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-merge/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-no-variant-for-merge/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-subproject-apply/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-subproject-apply/build.gradle.kts index 2de83d85..45d1a78b 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-subproject-apply/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-subproject-apply/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/android-test-tasks-filtering/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/android-test-tasks-filtering/build.gradle.kts index c3ef99cd..6e7ae000 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/android-test-tasks-filtering/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/android-test-tasks-filtering/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/build.gradle.kts index c5232e1a..f65e9a41 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.4.20" + kotlin("jvm") version ("2.2.20") } apply(plugin = "org.jetbrains.kotlinx.kover") diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/buildSrc/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/buildSrc/build.gradle.kts index 1118b382..b6e26536 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/buildSrc/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/buildsrc-usage/buildSrc/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.4.20" + kotlin("jvm") version ("2.2.20") } dependencies { diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/counters/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/build.gradle.kts index 45cdb164..1190ea7d 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/counters/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/build.gradle.kts index 2091438d..b3997a90 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version ("1.7.20") + kotlin("multiplatform") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/disabledUnitTests/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/disabledUnitTests/build.gradle.kts index a7215d13..55462ad0 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/disabledUnitTests/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/disabledUnitTests/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.2" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/k2-counters/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/k2-counters/build.gradle.kts index 727f9092..1190ea7d 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/k2-counters/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/k2-counters/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "2.0.0" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/build.gradle.kts index 374770c2..1190ea7d 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version ("1.7.20") + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-android/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-android/build.gradle.kts index c3ef99cd..6e7ae000 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-android/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-android/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-jvm/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-jvm/build.gradle.kts index b8be19ca..686dbbaa 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-jvm/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-jvm/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-variant-android/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-variant-android/build.gradle.kts index c3ef99cd..6e7ae000 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-variant-android/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/no-dependency-variant-android/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false id("org.jetbrains.kotlinx.kover") version "0.7.1" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-jvm/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-jvm/build.gradle.kts index 375188e5..d7d47200 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-jvm/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-jvm/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-mpp/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-mpp/build.gradle.kts index 27166ece..54d21efc 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-mpp/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/no-tests-mpp/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version ("1.8.20") + kotlin("multiplatform") version ("2.2.20") id ("org.jetbrains.kotlinx.kover") version "0.7.1" } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-android/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-android/build.gradle.kts index e1c2fe67..a9d379c5 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-android/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-android/build.gradle.kts @@ -3,7 +3,7 @@ */ plugins { - id("com.android.application") version "7.4.0" apply false - id("com.android.library") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-instrumentation/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-instrumentation/build.gradle.kts index 2a0971b5..db3318c9 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-instrumentation/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-instrumentation/build.gradle.kts @@ -3,7 +3,7 @@ */ plugins { - kotlin("jvm") version ("2.0.0") + kotlin("jvm") version ("2.2.20") } dependencies { diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify-each/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify-each/build.gradle.kts index 30ef4776..bf24c273 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify-each/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify-each/build.gradle.kts @@ -3,7 +3,7 @@ */ plugins { - kotlin("jvm") version ("2.0.0") + kotlin("jvm") version ("2.2.20") } dependencies { diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify/build.gradle.kts index 2a0971b5..db3318c9 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin-verify/build.gradle.kts @@ -3,7 +3,7 @@ */ plugins { - kotlin("jvm") version ("2.0.0") + kotlin("jvm") version ("2.2.20") } dependencies { diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin/build.gradle.kts index 40e2fd76..2fde3e98 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/settings-plugin/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version ("2.0.0") + kotlin("jvm") version ("2.2.20") } dependencies { diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts index 9ba7f2d6..12b901b6 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.7.10" + kotlin("multiplatform") version ("2.2.20") id("org.jetbrains.kotlinx.kover") version "0.7.0" } @@ -9,7 +9,6 @@ sourceSets.create("extra") kotlin { jvm { - withJava() } sourceSets { diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-multi/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-multi/build.gradle.kts index 0cbd5265..2f9e2089 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-multi/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-multi/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "2.1.0" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") version "0.7.0" } diff --git a/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/build.gradle.kts index fcaa9ca7..68a223c2 100644 --- a/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/build.gradle.kts +++ b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version ("2.2.20") id("org.jetbrains.kotlinx.kover") version "0.7.0" } diff --git a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/aggregation/commons/artifacts/Configurations.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/aggregation/commons/artifacts/Configurations.kt index 9bf76b2c..2155517b 100644 --- a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/aggregation/commons/artifacts/Configurations.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/aggregation/commons/artifacts/Configurations.kt @@ -14,6 +14,8 @@ import org.gradle.api.artifacts.Configuration * See: https://docs.gradle.org/7.5.1/userguide/declaring_dependencies.html */ internal fun Configuration.asTransitiveDependencies() { + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false isCanBeConsumed = false isTransitive = true @@ -29,6 +31,8 @@ internal fun Configuration.asTransitiveDependencies() { * See: https://docs.gradle.org/7.5.1/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs */ internal fun Configuration.asDependency() { + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = true isCanBeResolved = false isCanBeConsumed = false @@ -42,6 +46,8 @@ internal fun Configuration.asDependency() { */ internal fun Configuration.asProducer() { // disable generation of Kover artifacts on `assemble`, fix of https://github.com/Kotlin/kotlinx-kover/issues/353 + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = false // this configuration produces modules that can be consumed by other projects @@ -55,6 +61,8 @@ internal fun Configuration.asProducer() { * See: https://docs.gradle.org/7.5.1/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs */ internal fun Configuration.asConsumer() { + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = true // this config consumes modules from OTHER projects, and cannot be consumed by other projects diff --git a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/PrepareKover.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/PrepareKover.kt index 48a12deb..1b4fe520 100644 --- a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/PrepareKover.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/PrepareKover.kt @@ -45,6 +45,8 @@ internal fun prepare(project: Project): KoverContext { project.configurations.register("koverEmptyArtifact") { // disable generation of Kover artifacts on `assemble`, fix of https://github.com/Kotlin/kotlinx-kover/issues/353 + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false asProducer() attributes { diff --git a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/artifacts/AbstractVariantArtifacts.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/artifacts/AbstractVariantArtifacts.kt index dcc4c88d..22866b1d 100644 --- a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/artifacts/AbstractVariantArtifacts.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/artifacts/AbstractVariantArtifacts.kt @@ -47,6 +47,8 @@ internal sealed class AbstractVariantArtifacts( val artifactProperty = artifactGenTask.flatMap { task -> task.artifactFile } producerConfiguration = project.configurations.register(artifactConfigurationName(variantName)) { // disable generation of Kover artifacts on `assemble`, fix of https://github.com/Kotlin/kotlinx-kover/issues/353 + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false asProducer() attributes { diff --git a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt index 79bd1d15..6312a1fb 100644 --- a/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt @@ -90,6 +90,8 @@ internal interface ProductFlavorAttr : Named { * See: https://docs.gradle.org/7.5.1/userguide/declaring_dependencies.html */ internal fun Configuration.asTransitiveDependencies() { + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false isCanBeConsumed = false isTransitive = true @@ -105,6 +107,8 @@ internal fun Configuration.asTransitiveDependencies() { * See: https://docs.gradle.org/7.5.1/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs */ internal fun Configuration.asBucket() { + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = true isCanBeResolved = false isCanBeConsumed = false @@ -117,6 +121,8 @@ internal fun Configuration.asBucket() { * See: https://docs.gradle.org/7.5.1/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs */ internal fun Configuration.asProducer() { + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = false // this configuration produces modules that can be consumed by other projects @@ -130,6 +136,8 @@ internal fun Configuration.asProducer() { * See: https://docs.gradle.org/7.5.1/userguide/declaring_dependencies.html#sec:resolvable-consumable-configs */ internal fun Configuration.asConsumer() { + // leave this for compatibility with older versions + @Suppress("DEPRECATION") isVisible = false isCanBeResolved = true // this config consumes modules from OTHER projects, and cannot be consumed by other projects diff --git a/kover-jvm-agent/build.gradle.kts b/kover-jvm-agent/build.gradle.kts index 196abf94..421f4cb5 100644 --- a/kover-jvm-agent/build.gradle.kts +++ b/kover-jvm-agent/build.gradle.kts @@ -32,8 +32,8 @@ koverDocs { } java { - sourceCompatibility = JavaVersion.VERSION_1_6 - targetCompatibility = JavaVersion.VERSION_1_6 + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 } repositories { diff --git a/kover-maven-plugin/build.gradle.kts b/kover-maven-plugin/build.gradle.kts index 288337bf..933abdb8 100644 --- a/kover-maven-plugin/build.gradle.kts +++ b/kover-maven-plugin/build.gradle.kts @@ -52,12 +52,18 @@ dependencies { functionalTestImplementation(kotlin("test")) functionalTestImplementation(libs.junit.jupiter) functionalTestImplementation(libs.junit.params) + "functionalTestRuntimeOnly"("org.junit.platform:junit-platform-launcher") } mavenPlugin { goalPrefix = "kover" } +tasks.generateMavenPluginDescriptor { + sourcesDirs.from(sourceSets.main.map { it.kotlin.srcDirs }) + classesDirs.from(sourceSets.main.map { it.kotlin.classesDirectory }) +} + kotlin { jvmToolchain { languageVersion = JavaLanguageVersion.of(8) diff --git a/kover-maven-plugin/src/main/kotlin/kotlinx/kover/maven/plugin/mojo/abstracts/AbstractReportTaskMojo.kt b/kover-maven-plugin/src/main/kotlin/kotlinx/kover/maven/plugin/mojo/abstracts/AbstractReportTaskMojo.kt index 6982cc56..dc67854f 100644 --- a/kover-maven-plugin/src/main/kotlin/kotlinx/kover/maven/plugin/mojo/abstracts/AbstractReportTaskMojo.kt +++ b/kover-maven-plugin/src/main/kotlin/kotlinx/kover/maven/plugin/mojo/abstracts/AbstractReportTaskMojo.kt @@ -26,6 +26,7 @@ abstract class AbstractReportTaskMojo : AbstractCoverageTaskMojo(), MavenMultiPa @Parameter(defaultValue = "\${project.reporting.outputDirectory}/$KOVER_REPORTS_PATH") protected var outputDirectory: File = File(".") + @Suppress("DEPRECATION") final override fun generate(sink: org.codehaus.doxia.sink.Sink?, locale: Locale?) { generate(sink, null, locale) } diff --git a/kover-offline-runtime/docs/index.md b/kover-offline-runtime/docs/index.md index 0e7ed6f9..a63813dc 100644 --- a/kover-offline-runtime/docs/index.md +++ b/kover-offline-runtime/docs/index.md @@ -97,7 +97,7 @@ It is also possible to save all log messages to a file, to do this, you need to Example of a custom binary report production using Kover tool CLI in Gradle ```kotlin plugins { - kotlin("jvm") version "1.8.0" + kotlin("jvm") version ("2.2.20") application } diff --git a/kover-offline-runtime/examples/runtime-api/build.gradle.kts b/kover-offline-runtime/examples/runtime-api/build.gradle.kts index c05e24f7..b07d4974 100644 --- a/kover-offline-runtime/examples/runtime-api/build.gradle.kts +++ b/kover-offline-runtime/examples/runtime-api/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.8.0" + kotlin("jvm") version ("2.2.20") } group = "org.jetbrains"