build: improve consistency of plugin declarations

modelix · Dec 13, 2023 · bbf7ebc · bbf7ebc
1 parent 78bca49
commit bbf7ebc
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 24 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,6 +19,8 @@ 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"}
 
 [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,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
+    kotlin("jvm")
     id("org.jetbrains.intellij") version "1.16.1"
 }
 

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") {