diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2dedf7c3..a775a62b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,8 +41,8 @@ so do familiarize yourself with the following guidelines. * Write the test that reproduces the bug. * Fixes without tests are accepted only in exceptional circumstances if it can be shown that writing the corresponding test is too hard or otherwise impractical. - * Place a test for the functionality of one or more Kover plugin classes in [unit tests directory](src/test/kotlin) - * Place in [functional test directory](src/functionalTest/kotlin) the test that check the functionality of the Kover plugin by the Gradle runs + * Place a test for the functionality of one or more Kover plugin classes in [unit tests directory](kover-gradle-plugin/src/test/kotlin) + * Place in [functional test directory](kover-gradle-plugin/src/functionalTest/kotlin) the test that check the functionality of the Kover plugin by the Gradle runs * Follow the style of writing tests that is used in this project: name test functions as `test...`, don't use backticks in test names. Name test classes as `...Tests`. * Fixes that, in addition to directly solving the bug, add a large piece of new functionality or change the existing one, will be considered as features diff --git a/README.md b/README.md index d92f24c6..d950c7ce 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ dependencies { in this case report will be generated for current project joined with `:another:project` project. -**More examples of Gradle plugin applying can be found in [example folder](examples)** +**More examples of Gradle plugin applying can be found in [example folder](kover-gradle-plugin/examples)** ## Building locally and Contributing diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 00000000..754645df --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + `kotlin-dsl` +} + +kotlin { + jvmToolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + +repositories { + mavenCentral() +} diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/build-logic/gradle.properties @@ -0,0 +1 @@ + diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts new file mode 100644 index 00000000..7fbbd448 --- /dev/null +++ b/build-logic/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "build-logic" diff --git a/buildSrc/src/main/kotlin/kover-publishing-conventions.gradle.kts b/build-logic/src/main/kotlin/kotlinx/kover/conventions/kover-publishing-conventions.gradle.kts similarity index 100% rename from buildSrc/src/main/kotlin/kover-publishing-conventions.gradle.kts rename to build-logic/src/main/kotlin/kotlinx/kover/conventions/kover-publishing-conventions.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index 876c922b..00000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - `kotlin-dsl` -} - -repositories { - mavenCentral() -} diff --git a/docs/gradle-plugin/configuring.md b/docs/gradle-plugin/configuring.md index 6fb14a87..09872baf 100644 --- a/docs/gradle-plugin/configuring.md +++ b/docs/gradle-plugin/configuring.md @@ -301,7 +301,8 @@ If inclusion and exclusion rules are specified at the same time, then excludes h This means that even if a class is specified in both the inclusion and exclusion rules, it will be excluded from the report (e.g. class `com.example.Class1` above). It is acceptable to filter a class from the report by its fully-qualified name - using `classes` or `packages`. Also acceptable to filter a class, function or getter marked with the specified annotation - `annotatedBy`. -**Kover supports filtering by annotations having `AnnotationRetention` `BINARY` or `RUNTIME`. + +**Kover supports filtering by annotations having `AnnotationRetention` `BINARY` or `RUNTIME`.** [Wildcards](#class-name-with-wildcards) `*` and `?` are allowed in class names. diff --git a/docs/gradle-plugin/development/functionalTests.md b/docs/gradle-plugin/development/functionalTests.md index de605bcf..748f09b1 100644 --- a/docs/gradle-plugin/development/functionalTests.md +++ b/docs/gradle-plugin/development/functionalTests.md @@ -4,10 +4,10 @@ Functional tests run Gradle in a separate system process, and then check the res By default, to run functional tests, Gradle is used, which builds the plugin as its dependency. ## Test types - * examples - used to demonstrate the use of the Kover plugin on ready-made projects. Located in specified subdirectory of [examples](/examples). + * examples - used to demonstrate the use of the Kover plugin on ready-made projects. Located in specified subdirectory of [examples](/kover-gradle-plugin/examples). For such projects, it is mandatory that the latest release version of the plugin is used in the build script (the value of the `releaseVersion` property).
To create test on all examples, use `@kotlinx.kover.test.functional.framework.starter.ExamplesTest` annotation on function. This function must have receiver or single parameter with type `kotlinx.kover.test.functional.framework.checker.CheckerContext` to check result of Gradle run. - * templates - test on some specific rare case. Located in special [directory](/src/functionalTest/templates). You can execute any Gradle command for template project. + * templates - test on some specific rare case. Located in special [directory](/kover-gradle-plugin/src/functionalTest/templates). You can execute any Gradle command for template project.
To create test on all examples, use `@kotlinx.kover.test.functional.framework.starter.TemplateTest` annotation on function. This function must have receiver or single parameter with type `kotlinx.kover.test.functional.framework.checker.CheckerContext` to check result of Gradle run. * single generated test - launching a project without a ready source code. The project is builded using the configurator in the code of the test itself. This makes the test code more versatile - it is suitable for creating builds in different script languages and using different Kotlin plugins or different Coverage Tools.
To create test on all examples, use `@kotlinx.kover.test.functional.framework.starter.TemplateTest` annotation on function. This function must have receiver or single parameter with type `kotlinx.kover.test.functional.framework.configurator.BuildConfigurator` to generate projects and perform Gradle run with checks. diff --git a/gradle.properties b/gradle.properties index e4b63dc1..3cd3997e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,4 @@ group=org.jetbrains.kotlinx # version of the latest release kover.release.version=0.7.1 -kotlinVersion=1.8.20 kotlin.code.style=official diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..28a69a62 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,25 @@ +[versions] + +intellij-coverage = "1.0.721" +junit = "5.9.0" +kotlinx-bcv = "0.13.0" +kotlinx-dokka = "1.8.10" +args4j = "2.33" + +[libraries] + +# IntelliJ coverage library +intellij-reporter = { module = "org.jetbrains.intellij.deps:intellij-coverage-reporter", version.ref = "intellij-coverage" } +intellij-offline = { module = "org.jetbrains.intellij.deps:intellij-coverage-offline", version.ref = "intellij-coverage" } + +# JUnit +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } +junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" } + +args4j = { module = "args4j:args4j", version.ref = "args4j" } + +gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin" } + +[plugins] +kotlinx-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-bcv" } +kotlinx-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlinx-dokka" } diff --git a/toolset/kover-cli/README.md b/kover-cli/README.md similarity index 76% rename from toolset/kover-cli/README.md rename to kover-cli/README.md index b70a73f2..d92f6360 100644 --- a/toolset/kover-cli/README.md +++ b/kover-cli/README.md @@ -2,4 +2,4 @@ This single jar artifact allows using some of the functionality of Kover Toolset through command-line calls. -[CLI documentation](../../docs/cli/index.md) \ No newline at end of file +[CLI documentation](../docs/cli/index.md) \ No newline at end of file diff --git a/toolset/kover-cli/build.gradle.kts b/kover-cli/build.gradle.kts similarity index 85% rename from toolset/kover-cli/build.gradle.kts rename to kover-cli/build.gradle.kts index 8fff4b27..aa9606d5 100644 --- a/toolset/kover-cli/build.gradle.kts +++ b/kover-cli/build.gradle.kts @@ -26,14 +26,15 @@ extensions.configure, runIndex: Int = 0): BuildRe gradleArgs += "--no-daemon" } - val wrapperDir = if (gradleWrapperVersion == null) defaultWrapperDir else getWrapper(gradleWrapperVersion) + val wrapperDir = if (gradleWrapperVersion == null) defaultGradleWrapperDir else getWrapper(gradleWrapperVersion) logInfo("Run Gradle commands $gradleArgs for project '${this.canonicalPath}' with wrapper '${wrapperDir.canonicalPath}'") @@ -83,7 +79,7 @@ internal class BuildResult(exitCode: Int, private val logFile: File) { } private fun getWrapper(version: String): File { - val wrapperDir = wrappersRoot.resolve(version) + val wrapperDir = gradleWrappersRoot.resolve(version) if (!wrapperDir.exists()) throw Exception("Wrapper for Gradle version '$version' is not supported by functional tests") return wrapperDir } diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Commons.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Commons.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Commons.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Commons.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Example.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Example.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Example.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Example.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Simple.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Simple.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Simple.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Simple.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Single.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Single.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Single.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Single.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Sliced.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Sliced.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Sliced.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Sliced.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Template.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Template.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Template.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/starter/Template.kt diff --git a/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 similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildScriptWriter.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildScriptWriter.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildWriter.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildWriter.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildWriter.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/BuildWriter.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/FormattedWriter.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/FormattedWriter.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/FormattedWriter.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/FormattedWriter.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/Formatter.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/Formatter.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/Formatter.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/Formatter.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverReportWriter.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverReportWriter.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverReportWriter.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverReportWriter.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverWriter.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverWriter.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverWriter.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/KoverWriter.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/SettingsWriter.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/SettingsWriter.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/SettingsWriter.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/framework/writer/SettingsWriter.kt diff --git a/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/simple/GradleTests.kt b/kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/simple/GradleTests.kt similarity index 100% rename from src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/simple/GradleTests.kt rename to kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/simple/GradleTests.kt diff --git a/src/functionalTest/templates/builds/counters/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/build.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/counters/build.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/counters/build.gradle.kts diff --git a/src/functionalTest/templates/builds/counters/settings.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/settings.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/counters/settings.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/counters/settings.gradle.kts diff --git a/src/functionalTest/templates/builds/counters/src/main/kotlin/Branches.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Branches.kt similarity index 100% rename from src/functionalTest/templates/builds/counters/src/main/kotlin/Branches.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Branches.kt diff --git a/src/functionalTest/templates/builds/counters/src/main/kotlin/Different.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Different.kt similarity index 100% rename from src/functionalTest/templates/builds/counters/src/main/kotlin/Different.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Different.kt diff --git a/src/functionalTest/templates/builds/counters/src/main/kotlin/Objects.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Objects.kt similarity index 100% rename from src/functionalTest/templates/builds/counters/src/main/kotlin/Objects.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Objects.kt diff --git a/src/functionalTest/templates/builds/counters/src/main/kotlin/Sealed.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Sealed.kt similarity index 100% rename from src/functionalTest/templates/builds/counters/src/main/kotlin/Sealed.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/main/kotlin/Sealed.kt diff --git a/src/functionalTest/templates/builds/counters/src/test/kotlin/TestClass.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/test/kotlin/TestClass.kt similarity index 100% rename from src/functionalTest/templates/builds/counters/src/test/kotlin/TestClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/counters/src/test/kotlin/TestClass.kt diff --git a/src/functionalTest/templates/builds/different-plugins/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/build.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/different-plugins/build.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/build.gradle.kts diff --git a/src/functionalTest/templates/builds/different-plugins/settings.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/settings.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/different-plugins/settings.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/settings.gradle.kts diff --git a/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 similarity index 100% rename from src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/build.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/build.gradle.kts diff --git a/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonMain/kotlin/CommonClass.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonMain/kotlin/CommonClass.kt similarity index 100% rename from src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonMain/kotlin/CommonClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonMain/kotlin/CommonClass.kt diff --git a/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonTest/kotlin/CommonTest.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonTest/kotlin/CommonTest.kt similarity index 100% rename from src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonTest/kotlin/CommonTest.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/commonTest/kotlin/CommonTest.kt diff --git a/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmMain/kotlin/JvmClass.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmMain/kotlin/JvmClass.kt similarity index 100% rename from src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmMain/kotlin/JvmClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmMain/kotlin/JvmClass.kt diff --git a/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmTest/kotlin/JvmTest.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmTest/kotlin/JvmTest.kt similarity index 100% rename from src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmTest/kotlin/JvmTest.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/different-plugins/subproject-multiplatform/src/jvmTest/kotlin/JvmTest.kt diff --git a/src/functionalTest/templates/builds/nested-project/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/build.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/nested-project/build.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/build.gradle.kts diff --git a/src/functionalTest/templates/builds/nested-project/settings.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/settings.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/nested-project/settings.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/settings.gradle.kts diff --git a/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 similarity index 100% rename from src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/build.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/build.gradle.kts diff --git a/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/src/test/kotlin/MyTest.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/src/test/kotlin/MyTest.kt similarity index 100% rename from src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/src/test/kotlin/MyTest.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/nested-project/subprojects/alpha-project/src/test/kotlin/MyTest.kt diff --git a/src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/build.gradle.kts diff --git a/src/functionalTest/templates/builds/sourcesets-mpp/settings.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/settings.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/sourcesets-mpp/settings.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/settings.gradle.kts diff --git a/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmExtra/kotlin/ExtraClass.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmExtra/kotlin/ExtraClass.kt similarity index 100% rename from src/functionalTest/templates/builds/sourcesets-mpp/src/jvmExtra/kotlin/ExtraClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmExtra/kotlin/ExtraClass.kt diff --git a/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmMain/kotlin/AppClasses.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmMain/kotlin/AppClasses.kt similarity index 100% rename from src/functionalTest/templates/builds/sourcesets-mpp/src/jvmMain/kotlin/AppClasses.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmMain/kotlin/AppClasses.kt diff --git a/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmTest/kotlin/TestClasses.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmTest/kotlin/TestClasses.kt similarity index 100% rename from src/functionalTest/templates/builds/sourcesets-mpp/src/jvmTest/kotlin/TestClasses.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets-mpp/src/jvmTest/kotlin/TestClasses.kt diff --git a/src/functionalTest/templates/builds/sourcesets/build.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/build.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/sourcesets/build.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/build.gradle.kts diff --git a/src/functionalTest/templates/builds/sourcesets/settings.gradle.kts b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/settings.gradle.kts similarity index 100% rename from src/functionalTest/templates/builds/sourcesets/settings.gradle.kts rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/settings.gradle.kts diff --git a/src/functionalTest/templates/builds/sourcesets/src/extra/kotlin/ExtraClass.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/src/extra/kotlin/ExtraClass.kt similarity index 100% rename from src/functionalTest/templates/builds/sourcesets/src/extra/kotlin/ExtraClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/src/extra/kotlin/ExtraClass.kt diff --git a/src/functionalTest/templates/builds/sourcesets/src/main/kotlin/AppClasses.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/src/main/kotlin/AppClasses.kt similarity index 100% rename from src/functionalTest/templates/builds/sourcesets/src/main/kotlin/AppClasses.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/src/main/kotlin/AppClasses.kt diff --git a/src/functionalTest/templates/builds/sourcesets/src/test/kotlin/TestClasses.kt b/kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/src/test/kotlin/TestClasses.kt similarity index 100% rename from src/functionalTest/templates/builds/sourcesets/src/test/kotlin/TestClasses.kt rename to kover-gradle-plugin/src/functionalTest/templates/builds/sourcesets/src/test/kotlin/TestClasses.kt diff --git a/src/functionalTest/templates/sources/annotations-main/main/kotlin/Sources.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/annotations-main/main/kotlin/Sources.kt similarity index 100% rename from src/functionalTest/templates/sources/annotations-main/main/kotlin/Sources.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/annotations-main/main/kotlin/Sources.kt diff --git a/src/functionalTest/templates/sources/annotations-main/test/kotlin/TestClass.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/annotations-main/test/kotlin/TestClass.kt similarity index 100% rename from src/functionalTest/templates/sources/annotations-main/test/kotlin/TestClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/annotations-main/test/kotlin/TestClass.kt diff --git a/src/functionalTest/templates/sources/multiproject-common/main/kotlin/CommonSources.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-common/main/kotlin/CommonSources.kt similarity index 100% rename from src/functionalTest/templates/sources/multiproject-common/main/kotlin/CommonSources.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-common/main/kotlin/CommonSources.kt diff --git a/src/functionalTest/templates/sources/multiproject-common/test/kotlin/CommonTestClass.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-common/test/kotlin/CommonTestClass.kt similarity index 100% rename from src/functionalTest/templates/sources/multiproject-common/test/kotlin/CommonTestClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-common/test/kotlin/CommonTestClass.kt diff --git a/src/functionalTest/templates/sources/multiproject-user/main/kotlin/UserSources.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-user/main/kotlin/UserSources.kt similarity index 100% rename from src/functionalTest/templates/sources/multiproject-user/main/kotlin/UserSources.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-user/main/kotlin/UserSources.kt diff --git a/src/functionalTest/templates/sources/multiproject-user/test/kotlin/UserTestClass.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-user/test/kotlin/UserTestClass.kt similarity index 100% rename from src/functionalTest/templates/sources/multiproject-user/test/kotlin/UserTestClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/multiproject-user/test/kotlin/UserTestClass.kt diff --git a/src/functionalTest/templates/sources/simple/main/kotlin/Sources.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/simple/main/kotlin/Sources.kt similarity index 100% rename from src/functionalTest/templates/sources/simple/main/kotlin/Sources.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/simple/main/kotlin/Sources.kt diff --git a/src/functionalTest/templates/sources/simple/test/kotlin/TestClass.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/simple/test/kotlin/TestClass.kt similarity index 100% rename from src/functionalTest/templates/sources/simple/test/kotlin/TestClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/simple/test/kotlin/TestClass.kt diff --git a/src/functionalTest/templates/sources/verification/main/kotlin/FirstClasses.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/verification/main/kotlin/FirstClasses.kt similarity index 100% rename from src/functionalTest/templates/sources/verification/main/kotlin/FirstClasses.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/verification/main/kotlin/FirstClasses.kt diff --git a/src/functionalTest/templates/sources/verification/main/kotlin/SecondClasses.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/verification/main/kotlin/SecondClasses.kt similarity index 100% rename from src/functionalTest/templates/sources/verification/main/kotlin/SecondClasses.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/verification/main/kotlin/SecondClasses.kt diff --git a/src/functionalTest/templates/sources/verification/test/kotlin/TestClass.kt b/kover-gradle-plugin/src/functionalTest/templates/sources/verification/test/kotlin/TestClass.kt similarity index 100% rename from src/functionalTest/templates/sources/verification/test/kotlin/TestClass.kt rename to kover-gradle-plugin/src/functionalTest/templates/sources/verification/test/kotlin/TestClass.kt diff --git a/src/main/kotlin/kotlinx/kover/api/CoverageTools.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/CoverageTools.kt similarity index 95% rename from src/main/kotlin/kotlinx/kover/api/CoverageTools.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/CoverageTools.kt index adaafd35..5694a5fa 100644 --- a/src/main/kotlin/kotlinx/kover/api/CoverageTools.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/CoverageTools.kt @@ -4,9 +4,7 @@ package kotlinx.kover.api -import kotlinx.kover.gradle.plugin.commons.* import kotlinx.kover.gradle.plugin.commons.KoverMigrations.MIGRATION_0_6_TO_0_7 -import org.gradle.api.tasks.* // DEPRECATIONS diff --git a/src/main/kotlin/kotlinx/kover/api/KoverConfig.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverConfig.kt similarity index 97% rename from src/main/kotlin/kotlinx/kover/api/KoverConfig.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverConfig.kt index d7133945..c3565298 100644 --- a/src/main/kotlin/kotlinx/kover/api/KoverConfig.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverConfig.kt @@ -7,11 +7,6 @@ package kotlinx.kover.api import kotlinx.kover.gradle.plugin.commons.KoverMigrations.MIGRATION_0_6_TO_0_7 -import org.gradle.api.* -import org.gradle.api.model.* -import org.gradle.api.provider.* -import org.gradle.kotlin.dsl.* -import javax.inject.* @Deprecated( message = "Class was removed. Please refer to migration guide in order to migrate: $MIGRATION_0_6_TO_0_7", diff --git a/src/main/kotlin/kotlinx/kover/api/KoverConstants.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverConstants.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/api/KoverConstants.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverConstants.kt diff --git a/src/main/kotlin/kotlinx/kover/api/KoverTaskExtension.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverTaskExtension.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/api/KoverTaskExtension.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverTaskExtension.kt diff --git a/src/main/kotlin/kotlinx/kover/api/KoverVersions.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverVersions.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/api/KoverVersions.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/api/KoverVersions.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/KoverGradlePlugin.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/KoverGradlePlugin.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/KoverGradlePlugin.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/KoverGradlePlugin.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AndroidApplier.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AndroidApplier.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AndroidApplier.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AndroidApplier.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AppliersCommons.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AppliersCommons.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AppliersCommons.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/AppliersCommons.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/Artifacts.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/Artifacts.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/Artifacts.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/Artifacts.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/JvmTestTaskApplier.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/JvmTestTaskApplier.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/JvmTestTaskApplier.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/JvmTestTaskApplier.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ProjectApplier.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ProjectApplier.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ProjectApplier.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ProjectApplier.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ReportsApplier.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ReportsApplier.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ReportsApplier.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/ReportsApplier.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Artifacts.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Artifacts.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Artifacts.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Artifacts.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Configurations.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Constants.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Constants.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Constants.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Constants.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Exceptions.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Exceptions.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Exceptions.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Exceptions.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Naming.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Naming.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Naming.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Naming.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Paths.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Paths.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Paths.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Paths.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Types.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Types.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Types.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/commons/Types.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/Commons.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/Commons.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/Commons.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/Commons.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverProjectExtension.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverProjectExtension.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverProjectExtension.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverProjectExtension.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverReportExtension.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverReportExtension.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverReportExtension.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverReportExtension.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverVersions.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverVersions.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverVersions.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverVersions.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverProjectExtension.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverProjectExtension.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverProjectExtension.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverProjectExtension.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverReportExtension.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverReportExtension.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverReportExtension.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/KoverReportExtension.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Android.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Android.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Android.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Android.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Commons.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Commons.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Commons.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/Commons.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/CompilationKitLocator.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/CompilationKitLocator.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/locators/CompilationKitLocator.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/CompilationKitLocator.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/EmptyLocator.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/EmptyLocator.kt similarity index 95% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/locators/EmptyLocator.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/EmptyLocator.kt index 00550d37..e6df8878 100644 --- a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/EmptyLocator.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/EmptyLocator.kt @@ -6,7 +6,6 @@ package kotlinx.kover.gradle.plugin.locators import kotlinx.kover.gradle.plugin.commons.* import kotlinx.kover.gradle.plugin.dsl.internal.KoverProjectExtensionImpl -import org.gradle.api.* internal class EmptyLocator : CompilationKitLocator { diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinAndroidLocator.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinAndroidLocator.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinAndroidLocator.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinAndroidLocator.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinJvmLocator.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinJvmLocator.kt similarity index 98% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinJvmLocator.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinJvmLocator.kt index e1bced5e..99527676 100644 --- a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinJvmLocator.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinJvmLocator.kt @@ -8,7 +8,6 @@ import kotlinx.kover.gradle.plugin.commons.* import kotlinx.kover.gradle.plugin.dsl.internal.* import kotlinx.kover.gradle.plugin.util.* import org.gradle.api.* -import org.gradle.api.tasks.* import org.gradle.api.tasks.testing.Test import org.gradle.kotlin.dsl.* diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinMultiPlatformLocator.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinMultiPlatformLocator.kt similarity index 99% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinMultiPlatformLocator.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinMultiPlatformLocator.kt index 9203128c..2509e054 100644 --- a/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinMultiPlatformLocator.kt +++ b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/locators/KotlinMultiPlatformLocator.kt @@ -8,7 +8,6 @@ import kotlinx.kover.gradle.plugin.commons.* import kotlinx.kover.gradle.plugin.dsl.internal.KoverProjectExtensionImpl import kotlinx.kover.gradle.plugin.util.* import org.gradle.api.* -import org.gradle.api.tasks.* import org.gradle.api.tasks.testing.* import org.gradle.kotlin.dsl.* diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/AbstractKoverReportTask.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/AbstractKoverReportTask.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/AbstractKoverReportTask.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/AbstractKoverReportTask.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverHtmlTask.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverHtmlTask.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverHtmlTask.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverHtmlTask.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverVerifyTask.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverVerifyTask.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverVerifyTask.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverVerifyTask.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverXmlTask.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverXmlTask.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverXmlTask.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/reports/KoverXmlTask.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverAgentJarTask.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverAgentJarTask.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverAgentJarTask.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverAgentJarTask.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverArtifactGenerationTask.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverArtifactGenerationTask.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverArtifactGenerationTask.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tasks/services/KoverArtifactGenerationTask.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/CoverageTool.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/CoverageTool.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/CoverageTool.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/CoverageTool.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/Violations.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/Violations.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/Violations.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/Violations.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoAnt.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoAnt.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoAnt.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoAnt.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoHtmlOrXmlReport.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoHtmlOrXmlReport.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoHtmlOrXmlReport.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoHtmlOrXmlReport.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoOnlineInstrumentation.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoOnlineInstrumentation.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoOnlineInstrumentation.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoOnlineInstrumentation.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoTool.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoTool.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoTool.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoTool.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/Verification.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/Verification.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/Verification.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/Verification.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverHtmlOrXmlReport.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverHtmlOrXmlReport.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverHtmlOrXmlReport.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverHtmlOrXmlReport.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverOnlineInstrumentation.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverOnlineInstrumentation.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverOnlineInstrumentation.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverOnlineInstrumentation.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverReportAggregator.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverReportAggregator.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverReportAggregator.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverReportAggregator.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverTool.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverTool.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverTool.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverTool.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/Verification.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/Verification.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/Verification.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/Verification.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/util/DynamicBean.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/util/DynamicBean.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/util/DynamicBean.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/util/DynamicBean.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/util/Util.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/util/Util.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/util/Util.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/util/Util.kt diff --git a/src/main/kotlin/kotlinx/kover/gradle/plugin/util/Versions.kt b/kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/util/Versions.kt similarity index 100% rename from src/main/kotlin/kotlinx/kover/gradle/plugin/util/Versions.kt rename to kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/util/Versions.kt diff --git a/toolset/kover-offline-runtime/build.gradle.kts b/kover-offline-runtime/build.gradle.kts similarity index 93% rename from toolset/kover-offline-runtime/build.gradle.kts rename to kover-offline-runtime/build.gradle.kts index 1004f10b..0e151096 100644 --- a/toolset/kover-offline-runtime/build.gradle.kts +++ b/kover-offline-runtime/build.gradle.kts @@ -29,7 +29,7 @@ repositories { } dependencies { - implementation("org.jetbrains.intellij.deps:intellij-coverage-offline:1.0.721") + implementation(libs.intellij.offline) } tasks.jar { @@ -40,5 +40,4 @@ tasks.jar { exclude("META-INF/**") exclude("LICENSE") } - } diff --git a/settings.gradle.kts b/settings.gradle.kts index 57cea458..6001d9a9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,11 +1,19 @@ -rootProject.name = "kover-gradle-plugin" +rootProject.name = "kover" pluginManagement { - val kotlinVersion: String by settings + includeBuild("build-logic") + plugins { - kotlin("jvm") version kotlinVersion + kotlin("jvm") version embeddedKotlinVersion + } +} + +dependencyResolutionManagement { + versionCatalogs { + create("libs") } } -include(":toolset:kover-cli") -include(":toolset:kover-offline-runtime") \ No newline at end of file +include(":kover-gradle-plugin") +include(":kover-cli") +include(":kover-offline-runtime")