From d36dd479c74feac78310617efd63297d42c1f2ca Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Tue, 30 May 2023 11:01:18 +0200 Subject: [PATCH] build(Gradle): Apply ORT conventions plugins instead of core plugins This prepares for migrating build logic in these projects. Signed-off-by: Sebastian Schuberth --- advisor/build.gradle.kts | 4 ++-- analyzer/build.gradle.kts | 4 +++- cli/build.gradle.kts | 4 ++-- clients/clearly-defined/build.gradle.kts | 4 ++-- clients/fossid-webapp/build.gradle.kts | 4 ++-- clients/github-graphql/build.gradle.kts | 4 ++-- clients/nexus-iq/build.gradle.kts | 4 ++-- clients/oss-index/build.gradle.kts | 4 ++-- clients/osv/build.gradle.kts | 4 ++-- clients/scanoss/build.gradle.kts | 4 ++-- clients/vulnerable-code/build.gradle.kts | 4 ++-- detekt-rules/build.gradle.kts | 4 ++-- downloader/build.gradle.kts | 4 ++-- evaluator/build.gradle.kts | 4 ++-- helper-cli/build.gradle.kts | 4 ++-- model/build.gradle.kts | 4 ++-- notifier/build.gradle.kts | 4 ++-- plugins/commands/advisor/build.gradle.kts | 4 ++-- plugins/commands/analyzer/build.gradle.kts | 4 ++-- plugins/commands/api/build.gradle.kts | 4 ++-- plugins/commands/build.gradle.kts | 5 ++--- plugins/commands/compare/build.gradle.kts | 4 ++-- plugins/commands/config/build.gradle.kts | 4 ++-- plugins/commands/downloader/build.gradle.kts | 4 ++-- plugins/commands/evaluator/build.gradle.kts | 4 ++-- plugins/commands/notifier/build.gradle.kts | 4 ++-- plugins/commands/reporter/build.gradle.kts | 4 ++-- plugins/commands/requirements/build.gradle.kts | 4 ++-- plugins/commands/scanner/build.gradle.kts | 4 ++-- plugins/commands/upload-curations/build.gradle.kts | 4 ++-- plugins/commands/upload-result-to-postgres/build.gradle.kts | 4 ++-- plugins/commands/upload-result-to-sw360/build.gradle.kts | 4 ++-- plugins/package-curation-providers/api/build.gradle.kts | 4 ++-- plugins/package-curation-providers/build.gradle.kts | 5 ++--- .../clearly-defined/build.gradle.kts | 4 ++-- plugins/package-curation-providers/file/build.gradle.kts | 4 ++-- .../package-curation-providers/ort-config/build.gradle.kts | 4 ++-- plugins/package-curation-providers/sw360/build.gradle.kts | 4 ++-- plugins/package-managers/bower/build.gradle.kts | 4 ++-- plugins/package-managers/build.gradle.kts | 5 ++--- plugins/package-managers/bundler/build.gradle.kts | 4 ++-- plugins/package-managers/cargo/build.gradle.kts | 4 ++-- plugins/package-managers/carthage/build.gradle.kts | 4 ++-- plugins/package-managers/cocoapods/build.gradle.kts | 4 ++-- plugins/package-managers/composer/build.gradle.kts | 4 ++-- plugins/package-managers/conan/build.gradle.kts | 4 ++-- plugins/package-managers/gradle-inspector/build.gradle.kts | 4 ++-- plugins/package-managers/gradle/build.gradle.kts | 4 ++-- plugins/package-managers/node/build.gradle.kts | 4 ++-- plugins/package-managers/nuget/build.gradle.kts | 4 ++-- plugins/package-managers/pub/build.gradle.kts | 4 ++-- plugins/package-managers/python/build.gradle.kts | 4 ++-- plugins/package-managers/spdx/build.gradle.kts | 4 ++-- plugins/package-managers/stack/build.gradle.kts | 4 ++-- plugins/package-managers/unmanaged/build.gradle.kts | 4 ++-- plugins/reporters/asciidoc/build.gradle.kts | 4 ++-- plugins/reporters/build.gradle.kts | 5 ++--- plugins/reporters/ctrlx/build.gradle.kts | 4 ++-- plugins/reporters/cyclonedx/build.gradle.kts | 4 ++-- plugins/reporters/evaluated-model/build.gradle.kts | 4 ++-- plugins/reporters/fossid/build.gradle.kts | 4 ++-- plugins/reporters/freemarker/build.gradle.kts | 4 ++-- plugins/reporters/gitlab/build.gradle.kts | 4 ++-- plugins/reporters/opossum/build.gradle.kts | 4 ++-- plugins/reporters/spdx/build.gradle.kts | 4 ++-- plugins/reporters/static-html/build.gradle.kts | 4 ++-- plugins/reporters/web-app/build.gradle.kts | 4 ++-- reporter/build.gradle.kts | 4 +++- scanner/build.gradle.kts | 4 ++-- utils/common/build.gradle.kts | 4 ++-- utils/ort/build.gradle.kts | 4 ++-- utils/scripting/build.gradle.kts | 4 ++-- utils/spdx/build.gradle.kts | 4 +++- utils/test/build.gradle.kts | 4 ++-- 74 files changed, 151 insertions(+), 149 deletions(-) diff --git a/advisor/build.gradle.kts b/advisor/build.gradle.kts index 41adac7794731..b7f1350071114 100644 --- a/advisor/build.gradle.kts +++ b/advisor/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/analyzer/build.gradle.kts b/analyzer/build.gradle.kts index bd550eacdde7a..ba190b992fd39 100644 --- a/analyzer/build.gradle.kts +++ b/analyzer/build.gradle.kts @@ -21,9 +21,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { // Apply core plugins. - `java-library` `java-test-fixtures` + // Apply precompiled plugins. + id("ort-library-conventions") + // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) } diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts index bf8fa67902f49..c147688a5e045 100644 --- a/cli/build.gradle.kts +++ b/cli/build.gradle.kts @@ -23,8 +23,8 @@ import java.nio.file.Files import org.graalvm.buildtools.gradle.tasks.BuildNativeImageTask plugins { - // Apply core plugins. - application + // Apply precompiled plugins. + id("ort-application-conventions") // Apply third-party plugins. alias(libs.plugins.graalVmNativeImage) diff --git a/clients/clearly-defined/build.gradle.kts b/clients/clearly-defined/build.gradle.kts index 676a7e5169293..5b78e643f2b5a 100644 --- a/clients/clearly-defined/build.gradle.kts +++ b/clients/clearly-defined/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/clients/fossid-webapp/build.gradle.kts b/clients/fossid-webapp/build.gradle.kts index ad8797eff1812..faac0de97c712 100644 --- a/clients/fossid-webapp/build.gradle.kts +++ b/clients/fossid-webapp/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/clients/github-graphql/build.gradle.kts b/clients/github-graphql/build.gradle.kts index 925bf8c505851..dd9bd6b0c6a19 100644 --- a/clients/github-graphql/build.gradle.kts +++ b/clients/github-graphql/build.gradle.kts @@ -21,8 +21,8 @@ import com.expediagroup.graphql.plugin.gradle.config.GraphQLSerializer import com.expediagroup.graphql.plugin.gradle.graphql plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.graphQl) diff --git a/clients/nexus-iq/build.gradle.kts b/clients/nexus-iq/build.gradle.kts index 232d359136fd5..85ed9040b148b 100644 --- a/clients/nexus-iq/build.gradle.kts +++ b/clients/nexus-iq/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/clients/oss-index/build.gradle.kts b/clients/oss-index/build.gradle.kts index c1fdf11e9a392..ba15c34dd10a2 100644 --- a/clients/oss-index/build.gradle.kts +++ b/clients/oss-index/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/clients/osv/build.gradle.kts b/clients/osv/build.gradle.kts index 267f9e66e3e97..80380dc04fcaa 100644 --- a/clients/osv/build.gradle.kts +++ b/clients/osv/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/clients/scanoss/build.gradle.kts b/clients/scanoss/build.gradle.kts index 00ca9820d9517..a1f46ca049af7 100644 --- a/clients/scanoss/build.gradle.kts +++ b/clients/scanoss/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/clients/vulnerable-code/build.gradle.kts b/clients/vulnerable-code/build.gradle.kts index 6645be4403a15..e85ad527a54cc 100644 --- a/clients/vulnerable-code/build.gradle.kts +++ b/clients/vulnerable-code/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/detekt-rules/build.gradle.kts b/detekt-rules/build.gradle.kts index 3e4b27acb778e..30a09d9ecd5f4 100644 --- a/detekt-rules/build.gradle.kts +++ b/detekt-rules/build.gradle.kts @@ -22,8 +22,8 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory import org.gradle.kotlin.dsl.support.serviceOf plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/downloader/build.gradle.kts b/downloader/build.gradle.kts index 53951497b2e06..4e3a5978c510f 100644 --- a/downloader/build.gradle.kts +++ b/downloader/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/evaluator/build.gradle.kts b/evaluator/build.gradle.kts index 259bb0691a108..1f37506b30d20 100644 --- a/evaluator/build.gradle.kts +++ b/evaluator/build.gradle.kts @@ -22,8 +22,8 @@ import de.undercouch.gradle.tasks.download.Download import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.download) diff --git a/helper-cli/build.gradle.kts b/helper-cli/build.gradle.kts index 7b071e7f86516..3bdea1bd3cc05 100644 --- a/helper-cli/build.gradle.kts +++ b/helper-cli/build.gradle.kts @@ -20,8 +20,8 @@ import java.nio.charset.Charset plugins { - // Apply core plugins. - application + // Apply precompiled plugins. + id("ort-application-conventions") } application { diff --git a/model/build.gradle.kts b/model/build.gradle.kts index cd086ca25f1b1..475ed249bd11e 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/notifier/build.gradle.kts b/notifier/build.gradle.kts index 062139a77ff68..16bf3f2c65906 100644 --- a/notifier/build.gradle.kts +++ b/notifier/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/commands/advisor/build.gradle.kts b/plugins/commands/advisor/build.gradle.kts index 6bdce298efe6b..951f2fb390f73 100644 --- a/plugins/commands/advisor/build.gradle.kts +++ b/plugins/commands/advisor/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/commands/analyzer/build.gradle.kts b/plugins/commands/analyzer/build.gradle.kts index 3c01c65756250..c28d0cee832ef 100644 --- a/plugins/commands/analyzer/build.gradle.kts +++ b/plugins/commands/analyzer/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/commands/api/build.gradle.kts b/plugins/commands/api/build.gradle.kts index 53fdf756faec9..3a8ee91c359bb 100644 --- a/plugins/commands/api/build.gradle.kts +++ b/plugins/commands/api/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/commands/build.gradle.kts b/plugins/commands/build.gradle.kts index 76803ac79c744..0c587fe581415 100644 --- a/plugins/commands/build.gradle.kts +++ b/plugins/commands/build.gradle.kts @@ -18,9 +18,8 @@ */ plugins { - // Apply core plugins. - `java-platform` - `maven-publish` + // Apply precompiled plugins. + id("ort-plugins-conventions") } javaPlatform { diff --git a/plugins/commands/compare/build.gradle.kts b/plugins/commands/compare/build.gradle.kts index dc63b97cb7033..9183db1d01be9 100644 --- a/plugins/commands/compare/build.gradle.kts +++ b/plugins/commands/compare/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/commands/config/build.gradle.kts b/plugins/commands/config/build.gradle.kts index 0183adad2292f..009180e38ee31 100644 --- a/plugins/commands/config/build.gradle.kts +++ b/plugins/commands/config/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/commands/downloader/build.gradle.kts b/plugins/commands/downloader/build.gradle.kts index 1554ca8f1c6a3..ec6bd6a45feb3 100644 --- a/plugins/commands/downloader/build.gradle.kts +++ b/plugins/commands/downloader/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/commands/evaluator/build.gradle.kts b/plugins/commands/evaluator/build.gradle.kts index 110ad253f7347..8944e2febd7f5 100644 --- a/plugins/commands/evaluator/build.gradle.kts +++ b/plugins/commands/evaluator/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/commands/notifier/build.gradle.kts b/plugins/commands/notifier/build.gradle.kts index 306e20cd6e643..699b72d0ec2bb 100644 --- a/plugins/commands/notifier/build.gradle.kts +++ b/plugins/commands/notifier/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/commands/reporter/build.gradle.kts b/plugins/commands/reporter/build.gradle.kts index 8569271b210a1..ec991cdd4749f 100644 --- a/plugins/commands/reporter/build.gradle.kts +++ b/plugins/commands/reporter/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/commands/requirements/build.gradle.kts b/plugins/commands/requirements/build.gradle.kts index b84989cf700b6..7a80281dc30eb 100644 --- a/plugins/commands/requirements/build.gradle.kts +++ b/plugins/commands/requirements/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/commands/scanner/build.gradle.kts b/plugins/commands/scanner/build.gradle.kts index 2aa2eb71e82d7..68044ee9d4601 100644 --- a/plugins/commands/scanner/build.gradle.kts +++ b/plugins/commands/scanner/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/commands/upload-curations/build.gradle.kts b/plugins/commands/upload-curations/build.gradle.kts index b054818869f7f..b7798e18dea37 100644 --- a/plugins/commands/upload-curations/build.gradle.kts +++ b/plugins/commands/upload-curations/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/commands/upload-result-to-postgres/build.gradle.kts b/plugins/commands/upload-result-to-postgres/build.gradle.kts index 7113aea127cc6..02e5ffdd48e34 100644 --- a/plugins/commands/upload-result-to-postgres/build.gradle.kts +++ b/plugins/commands/upload-result-to-postgres/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/commands/upload-result-to-sw360/build.gradle.kts b/plugins/commands/upload-result-to-sw360/build.gradle.kts index e47f341cd04c9..40095e2fba2b3 100644 --- a/plugins/commands/upload-result-to-sw360/build.gradle.kts +++ b/plugins/commands/upload-result-to-sw360/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/package-curation-providers/api/build.gradle.kts b/plugins/package-curation-providers/api/build.gradle.kts index d0ef47c39a60e..7cdb2f7f5b5bb 100644 --- a/plugins/package-curation-providers/api/build.gradle.kts +++ b/plugins/package-curation-providers/api/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-curation-providers/build.gradle.kts b/plugins/package-curation-providers/build.gradle.kts index d43aebc8ff986..cf2e54e76db7a 100644 --- a/plugins/package-curation-providers/build.gradle.kts +++ b/plugins/package-curation-providers/build.gradle.kts @@ -18,9 +18,8 @@ */ plugins { - // Apply core plugins. - `java-platform` - `maven-publish` + // Apply precompiled plugins. + id("ort-plugins-conventions") } javaPlatform { diff --git a/plugins/package-curation-providers/clearly-defined/build.gradle.kts b/plugins/package-curation-providers/clearly-defined/build.gradle.kts index 90e6a7728f0f7..0b2d404eddde8 100644 --- a/plugins/package-curation-providers/clearly-defined/build.gradle.kts +++ b/plugins/package-curation-providers/clearly-defined/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-curation-providers/file/build.gradle.kts b/plugins/package-curation-providers/file/build.gradle.kts index 15145c833773f..b56ce62066a10 100644 --- a/plugins/package-curation-providers/file/build.gradle.kts +++ b/plugins/package-curation-providers/file/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-curation-providers/ort-config/build.gradle.kts b/plugins/package-curation-providers/ort-config/build.gradle.kts index 6e785513ae81f..a4d3e067c3d8d 100644 --- a/plugins/package-curation-providers/ort-config/build.gradle.kts +++ b/plugins/package-curation-providers/ort-config/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-curation-providers/sw360/build.gradle.kts b/plugins/package-curation-providers/sw360/build.gradle.kts index 7cd11a5cd19b6..fd7db7dd87254 100644 --- a/plugins/package-curation-providers/sw360/build.gradle.kts +++ b/plugins/package-curation-providers/sw360/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/package-managers/bower/build.gradle.kts b/plugins/package-managers/bower/build.gradle.kts index 2887a7034cbf2..17ee915d68fc5 100644 --- a/plugins/package-managers/bower/build.gradle.kts +++ b/plugins/package-managers/bower/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/build.gradle.kts b/plugins/package-managers/build.gradle.kts index 390cde224cf0b..945af7627aa62 100644 --- a/plugins/package-managers/build.gradle.kts +++ b/plugins/package-managers/build.gradle.kts @@ -18,9 +18,8 @@ */ plugins { - // Apply core plugins. - `java-platform` - `maven-publish` + // Apply precompiled plugins. + id("ort-plugins-conventions") } javaPlatform { diff --git a/plugins/package-managers/bundler/build.gradle.kts b/plugins/package-managers/bundler/build.gradle.kts index dc569f8177fa5..58eee5474ec0e 100644 --- a/plugins/package-managers/bundler/build.gradle.kts +++ b/plugins/package-managers/bundler/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/cargo/build.gradle.kts b/plugins/package-managers/cargo/build.gradle.kts index 295e3a6c02702..b17b6422bd948 100644 --- a/plugins/package-managers/cargo/build.gradle.kts +++ b/plugins/package-managers/cargo/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/carthage/build.gradle.kts b/plugins/package-managers/carthage/build.gradle.kts index 4d8a7b1ee77fa..85a510aa82727 100644 --- a/plugins/package-managers/carthage/build.gradle.kts +++ b/plugins/package-managers/carthage/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/cocoapods/build.gradle.kts b/plugins/package-managers/cocoapods/build.gradle.kts index a885a40567b7a..9f67bd0d92afc 100644 --- a/plugins/package-managers/cocoapods/build.gradle.kts +++ b/plugins/package-managers/cocoapods/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/composer/build.gradle.kts b/plugins/package-managers/composer/build.gradle.kts index eef14b0dc8a11..ebeb4b15ab9f0 100644 --- a/plugins/package-managers/composer/build.gradle.kts +++ b/plugins/package-managers/composer/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/conan/build.gradle.kts b/plugins/package-managers/conan/build.gradle.kts index 054784f3f7246..794ed4b54324d 100644 --- a/plugins/package-managers/conan/build.gradle.kts +++ b/plugins/package-managers/conan/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/gradle-inspector/build.gradle.kts b/plugins/package-managers/gradle-inspector/build.gradle.kts index 3b3bf0d6d7c40..6c3a0dbbb87bf 100644 --- a/plugins/package-managers/gradle-inspector/build.gradle.kts +++ b/plugins/package-managers/gradle-inspector/build.gradle.kts @@ -21,8 +21,8 @@ import org.jetbrains.gradle.ext.settings import org.jetbrains.gradle.ext.taskTriggers plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.ideaExt) diff --git a/plugins/package-managers/gradle/build.gradle.kts b/plugins/package-managers/gradle/build.gradle.kts index 2751ecaff500a..a710e92bc191e 100644 --- a/plugins/package-managers/gradle/build.gradle.kts +++ b/plugins/package-managers/gradle/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/package-managers/node/build.gradle.kts b/plugins/package-managers/node/build.gradle.kts index baa91e22e51db..690fc0783ee92 100644 --- a/plugins/package-managers/node/build.gradle.kts +++ b/plugins/package-managers/node/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/nuget/build.gradle.kts b/plugins/package-managers/nuget/build.gradle.kts index 86ccfe33497a8..c1d0593c63d16 100644 --- a/plugins/package-managers/nuget/build.gradle.kts +++ b/plugins/package-managers/nuget/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/plugins/package-managers/pub/build.gradle.kts b/plugins/package-managers/pub/build.gradle.kts index 189b540a6e6a1..6c86e9075e35e 100644 --- a/plugins/package-managers/pub/build.gradle.kts +++ b/plugins/package-managers/pub/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/plugins/package-managers/python/build.gradle.kts b/plugins/package-managers/python/build.gradle.kts index 35df0c6e7eccf..3fb0501a2662d 100644 --- a/plugins/package-managers/python/build.gradle.kts +++ b/plugins/package-managers/python/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/plugins/package-managers/spdx/build.gradle.kts b/plugins/package-managers/spdx/build.gradle.kts index bf952ae3549cf..dd6803d9a1ebe 100644 --- a/plugins/package-managers/spdx/build.gradle.kts +++ b/plugins/package-managers/spdx/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/stack/build.gradle.kts b/plugins/package-managers/stack/build.gradle.kts index 8552b10e98d9f..43803f08ce97d 100644 --- a/plugins/package-managers/stack/build.gradle.kts +++ b/plugins/package-managers/stack/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/package-managers/unmanaged/build.gradle.kts b/plugins/package-managers/unmanaged/build.gradle.kts index c1689be8408f3..60c74ef37c784 100644 --- a/plugins/package-managers/unmanaged/build.gradle.kts +++ b/plugins/package-managers/unmanaged/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/asciidoc/build.gradle.kts b/plugins/reporters/asciidoc/build.gradle.kts index b326a457f2d13..a4874f05626a5 100644 --- a/plugins/reporters/asciidoc/build.gradle.kts +++ b/plugins/reporters/asciidoc/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/build.gradle.kts b/plugins/reporters/build.gradle.kts index 520690429f957..e742be4209be0 100644 --- a/plugins/reporters/build.gradle.kts +++ b/plugins/reporters/build.gradle.kts @@ -18,9 +18,8 @@ */ plugins { - // Apply core plugins. - `java-platform` - `maven-publish` + // Apply precompiled plugins. + id("ort-plugins-conventions") } javaPlatform { diff --git a/plugins/reporters/ctrlx/build.gradle.kts b/plugins/reporters/ctrlx/build.gradle.kts index cf08c17d40659..6b89e9d80bf5b 100644 --- a/plugins/reporters/ctrlx/build.gradle.kts +++ b/plugins/reporters/ctrlx/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/plugins/reporters/cyclonedx/build.gradle.kts b/plugins/reporters/cyclonedx/build.gradle.kts index 00ceab3c8e6a7..29be5159dbfa4 100644 --- a/plugins/reporters/cyclonedx/build.gradle.kts +++ b/plugins/reporters/cyclonedx/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/evaluated-model/build.gradle.kts b/plugins/reporters/evaluated-model/build.gradle.kts index 2ba0938bb6d01..35a77189b6eda 100644 --- a/plugins/reporters/evaluated-model/build.gradle.kts +++ b/plugins/reporters/evaluated-model/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/fossid/build.gradle.kts b/plugins/reporters/fossid/build.gradle.kts index 07edbd16c1321..55868abe289ae 100644 --- a/plugins/reporters/fossid/build.gradle.kts +++ b/plugins/reporters/fossid/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/freemarker/build.gradle.kts b/plugins/reporters/freemarker/build.gradle.kts index 44fb2af43768c..2701d46098a9f 100644 --- a/plugins/reporters/freemarker/build.gradle.kts +++ b/plugins/reporters/freemarker/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/gitlab/build.gradle.kts b/plugins/reporters/gitlab/build.gradle.kts index a212b3c54ac2f..ad7e5351b2b14 100644 --- a/plugins/reporters/gitlab/build.gradle.kts +++ b/plugins/reporters/gitlab/build.gradle.kts @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.kotlinSerialization) diff --git a/plugins/reporters/opossum/build.gradle.kts b/plugins/reporters/opossum/build.gradle.kts index f20ad2e603a6f..352a9d8dbafd3 100644 --- a/plugins/reporters/opossum/build.gradle.kts +++ b/plugins/reporters/opossum/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/spdx/build.gradle.kts b/plugins/reporters/spdx/build.gradle.kts index 04d171cbee01f..5b05f714cd43d 100644 --- a/plugins/reporters/spdx/build.gradle.kts +++ b/plugins/reporters/spdx/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/static-html/build.gradle.kts b/plugins/reporters/static-html/build.gradle.kts index 7c4b4824aba22..d89b229774148 100644 --- a/plugins/reporters/static-html/build.gradle.kts +++ b/plugins/reporters/static-html/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/plugins/reporters/web-app/build.gradle.kts b/plugins/reporters/web-app/build.gradle.kts index 0622867cbb689..60d487d42f8e8 100644 --- a/plugins/reporters/web-app/build.gradle.kts +++ b/plugins/reporters/web-app/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } val generatedResourcesDir = file("$buildDir/generated-resources/main") diff --git a/reporter/build.gradle.kts b/reporter/build.gradle.kts index 5a8d5297e37ec..4fed86bc8feb7 100644 --- a/reporter/build.gradle.kts +++ b/reporter/build.gradle.kts @@ -19,8 +19,10 @@ plugins { // Apply core plugins. - `java-library` `java-test-fixtures` + + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/scanner/build.gradle.kts b/scanner/build.gradle.kts index e0ea6c50be989..9c8e2d036ea1f 100644 --- a/scanner/build.gradle.kts +++ b/scanner/build.gradle.kts @@ -25,8 +25,8 @@ val licenseeVersion: String by project val scancodeVersion: String by project plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } repositories { diff --git a/utils/common/build.gradle.kts b/utils/common/build.gradle.kts index ee81394e95d61..64911cc8abf21 100644 --- a/utils/common/build.gradle.kts +++ b/utils/common/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/utils/ort/build.gradle.kts b/utils/ort/build.gradle.kts index 2a53d92aca15f..893eb74cd093a 100644 --- a/utils/ort/build.gradle.kts +++ b/utils/ort/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/utils/scripting/build.gradle.kts b/utils/scripting/build.gradle.kts index 80a73b9e9e009..1319cd9a51ad0 100644 --- a/utils/scripting/build.gradle.kts +++ b/utils/scripting/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies { diff --git a/utils/spdx/build.gradle.kts b/utils/spdx/build.gradle.kts index de7213bdb5ab2..cd10aeaa4f5e3 100644 --- a/utils/spdx/build.gradle.kts +++ b/utils/spdx/build.gradle.kts @@ -29,7 +29,9 @@ val spdxLicenseListVersion: String by project plugins { // Apply core plugins. antlr - `java-library` + + // Apply precompiled plugins. + id("ort-library-conventions") // Apply third-party plugins. alias(libs.plugins.download) diff --git a/utils/test/build.gradle.kts b/utils/test/build.gradle.kts index d7f8a085f5adb..6016ac2437bd1 100644 --- a/utils/test/build.gradle.kts +++ b/utils/test/build.gradle.kts @@ -18,8 +18,8 @@ */ plugins { - // Apply core plugins. - `java-library` + // Apply precompiled plugins. + id("ort-library-conventions") } dependencies {