build(Gradle): Apply ORT conventions plugins instead of core plugins

This prepares for migrating build logic in these projects. Signed-off-by: Sebastian Schuberth <[email protected]>
kamil-bielecki-bosch · Jun 20, 2023 · d36dd47 · d36dd47
1 parent 3fe4c5b
commit d36dd47
Show file tree

Hide file tree

Showing 74 changed files with 151 additions and 149 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -18,8 +18,8 @@
  */
 
 plugins {
-    // Apply core plugins.
-    `java-library`
+    // Apply precompiled plugins.
+    id("ort-library-conventions")
 }
 
 dependencies {