build: improve consistency of plugin declarations

mhuster23 · mhuster23 · commit 46433c753648 · 2023-12-18T12:55:55.000+01:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,6 +19,9 @@ dokka = {id = "org.jetbrains.dokka", version = "1.9.10"}
 node = {id = "com.github.node-gradle.node", version = "7.0.1"}
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.4" }
 npm-publish = { id = "dev.petuska.npm.publish", version = "3.4.1" }
+test-logger = { id = "com.adarshr.test-logger", version = "4.0.0" }
+shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+intellij = { id = "org.jetbrains.intellij", version = "1.16.1" }
 
 [versions]
 kotlin = "1.9.21"
diff --git a/kotlin-utils/build.gradle.kts b/kotlin-utils/build.gradle.kts
@@ -1,20 +1,18 @@
 plugins {
     `maven-publish`
-    id("org.jetbrains.kotlin.multiplatform")
+    kotlin("multiplatform")
 }
 
 kotlin {
     jvm()
     js(IR) {
         browser {}
         nodejs {
-            testTask(
-                Action {
-                    useMocha {
-                        timeout = "30s"
-                    }
-                },
-            )
+            testTask {
+                useMocha {
+                    timeout = "30s"
+                }
+            }
         }
         useCommonJs()
     }
diff --git a/model-api-gen-gradle/build.gradle.kts b/model-api-gen-gradle/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     java
 
     // Apply the Kotlin JVM plugin to add support for Kotlin.
-    id("org.jetbrains.kotlin.jvm")
+    kotlin("jvm")
 }
 
 dependencies {
diff --git a/model-api/build.gradle.kts b/model-api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("maven-publish")
-    id("org.jetbrains.kotlin.multiplatform")
+    `maven-publish`
+    kotlin("multiplatform")
     kotlin("plugin.serialization")
 }
 
diff --git a/model-client/build.gradle.kts b/model-client/build.gradle.kts
@@ -2,11 +2,11 @@ import dev.petuska.npm.publish.task.NpmPackTask
 
 plugins {
     `maven-publish`
-    id("org.jetbrains.kotlin.multiplatform")
-    id("com.diffplug.spotless")
+    kotlin("multiplatform")
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.npm.publish)
     `java-library`
     jacoco
-    alias(libs.plugins.npm.publish)
 }
 
 java {
diff --git a/model-datastructure/build.gradle.kts b/model-datastructure/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `maven-publish`
-    id("org.jetbrains.kotlin.multiplatform")
+    kotlin("multiplatform")
 }
 
 kotlin {
diff --git a/model-server/build.gradle.kts b/model-server/build.gradle.kts
@@ -3,11 +3,11 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTra
 
 plugins {
     application
-    id("com.diffplug.spotless")
     `maven-publish`
-    id("com.adarshr.test-logger") version "4.0.0"
-    id("org.jetbrains.kotlin.jvm")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.test.logger)
+    alias(libs.plugins.shadow)
+    kotlin("jvm")
     kotlin("plugin.serialization")
 }
 
diff --git a/mps-model-server-plugin/build.gradle.kts b/mps-model-server-plugin/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
-    id("org.jetbrains.intellij") version "1.16.1"
+    kotlin("jvm")
+    alias(libs.plugins.intellij)
 }
 
 val mpsToIdeaMap = mapOf(
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,9 +24,6 @@ pluginManagement {
         }
     }
 }
-plugins {
-    id("de.fayard.refreshVersions") version "0.60.3"
-}
 
 rootProject.name = "modelix.core"
 
diff --git a/ts-model-api/build.gradle.kts b/ts-model-api/build.gradle.kts
@@ -3,7 +3,7 @@ import com.github.gradle.node.npm.task.NpmTask
 plugins {
   base
   alias(libs.plugins.node)
-  id("org.jlleitschuh.gradle.ktlint") apply false
+  alias(libs.plugins.ktlint) apply false
 }
 
 tasks.named("npm_run_build") {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`java`
`6`	`6`
`7`	`7`	`// Apply the Kotlin JVM plugin to add support for Kotlin.`
`8`		`- id("org.jetbrains.kotlin.jvm")`
	`8`	`+ kotlin("jvm")`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`		`- id("maven-publish")`
`3`		`- id("org.jetbrains.kotlin.multiplatform")`
	`2`	+ `maven-publish`
	`3`	`+ kotlin("multiplatform")`
`4`	`4`	`kotlin("plugin.serialization")`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`maven-publish`
`3`		`- id("org.jetbrains.kotlin.multiplatform")`
	`3`	`+ kotlin("multiplatform")`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id("org.jetbrains.kotlin.jvm")`
`5`		`- id("org.jetbrains.intellij") version "1.16.1"`
	`4`	`+ kotlin("jvm")`
	`5`	`+ alias(libs.plugins.intellij)`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`val mpsToIdeaMap = mapOf(`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,6 @@ pluginManagement {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`-plugins {`
`28`		`- id("de.fayard.refreshVersions") version "0.60.3"`
`29`		`-}`
`30`	`27`
`31`	`28`	`rootProject.name = "modelix.core"`
`32`	`29`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import com.github.gradle.node.npm.task.NpmTask`
`3`	`3`	`plugins {`
`4`	`4`	`base`
`5`	`5`	`alias(libs.plugins.node)`
`6`		`- id("org.jlleitschuh.gradle.ktlint") apply false`
	`6`	`+ alias(libs.plugins.ktlint) apply false`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`tasks.named("npm_run_build") {`