avoid apply plugin

Thie commit prefers the slightly newer style of gradle plugin specification
davissuber · Oct 27, 2023 · 29d56d8 · 29d56d8
1 parent a60d6d8
commit 29d56d8
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 39 deletions.
diff --git a/ast/build.gradle b/ast/build.gradle
@@ -1,10 +1,10 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'kotlin-kapt'
+    id 'com.vanniktech.maven.publish'
 }
 
-apply plugin: 'kotlin-kapt'
-
 kotlin {
     jvmToolchain(11)
 }
@@ -16,5 +16,3 @@ dependencies {
     testImplementation deps.test.junit
     testImplementation deps.test.truth
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/compiler/ast/build.gradle b/compiler/ast/build.gradle
@@ -1,10 +1,10 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'kotlin-kapt'
+    id 'com.vanniktech.maven.publish'
 }
 
-apply plugin: 'kotlin-kapt'
-
 kotlin {
     jvmToolchain(11)
 }
@@ -23,5 +23,3 @@ dependencies {
     testImplementation deps.test.compileTesting
     testImplementation deps.test.roomCompilerProcessingTesting
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/compiler/build.gradle b/compiler/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'com.vanniktech.maven.publish'
 }
 
 kotlin {
@@ -37,5 +38,3 @@ dependencies {
 test {
     inputs.files(file("$rootDir/tests/src"))
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/compiler/ksp/build.gradle b/compiler/ksp/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
+    id 'com.vanniktech.maven.publish'
 }
 
 kotlin {
@@ -29,5 +30,3 @@ dependencies {
     testImplementation deps.test.compileTesting
     testImplementation deps.test.compileTestingKotlin
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'com.vanniktech.maven.publish'
 }
 
 kotlin {
@@ -12,5 +13,3 @@ dependencies {
 
     implementation deps.kotlin.stdlib
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/errormessage/build.gradle b/errormessage/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'com.vanniktech.maven.publish'
 }
 
 kotlin {
@@ -11,5 +12,3 @@ dependencies {
     implementation deps.kotlin.stdlib
     implementation project(':core')
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/intellij/ast/build.gradle b/intellij/ast/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id "org.jetbrains.intellij" version "1.15.0"
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'com.vanniktech.maven.publish'
 }
 
 intellij {
@@ -32,5 +33,3 @@ tasks {
         enabled = false
     }
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/intellij/build.gradle b/intellij/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id "org.jetbrains.intellij" version "1.15.0"
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'com.vanniktech.maven.publish'
 }
 
 intellij {
@@ -42,5 +43,3 @@ tasks {
         enabled = false
     }
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+    id 'com.vanniktech.maven.publish'
+}
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -7,5 +10,3 @@ dependencies {
     // Dagger is part of the API since we generate code which depends on Dagger's API in the consuming gradle module.
     api deps.dagger
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/models/build.gradle b/models/build.gradle
@@ -1,10 +1,10 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'kotlin-kapt'
+    id 'com.vanniktech.maven.publish'
 }
 
-apply plugin: 'kotlin-kapt'
-
 kotlin {
     jvmToolchain(11)
 }
@@ -20,5 +20,3 @@ dependencies {
     testImplementation deps.test.truth
     testImplementation deps.test.compileTesting
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/samples/sample-kotlin/build.gradle b/samples/sample-kotlin/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
 }
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 
 kotlin {
     jvmToolchain(11)

diff --git a/tests/build.gradle b/tests/build.gradle
@@ -1,11 +1,10 @@
 plugins {
     id 'com.google.devtools.ksp'
+    id 'java-library'
+    id 'kotlin'
+    id 'kotlin-kapt'
 }
 
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
-
 kotlin {
     jvmToolchain(11)
 }

diff --git a/viewmodel/build.gradle b/viewmodel/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.dokka'
+    id 'com.vanniktech.maven.publish'
 }
 
 kotlin {
@@ -14,5 +15,3 @@ dependencies {
 
     implementation deps.kotlin.stdlib
 }
-
-apply plugin: 'com.vanniktech.maven.publish'
diff --git a/xprocessing-testing/build.gradle b/xprocessing-testing/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow'
+    id 'com.vanniktech.maven.publish'
 }
 
 java {
@@ -43,5 +44,3 @@ artifacts {
     runtimeOnly shadowJar
     archives shadowJar
 }
-
-apply plugin: "com.vanniktech.maven.publish"
diff --git a/xprocessing/build.gradle b/xprocessing/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow'
+    id 'com.vanniktech.maven.publish'
 }
 
 java {
@@ -43,5 +44,3 @@ artifacts {
     runtimeOnly shadowJar
     archives shadowJar
 }
-
-apply plugin: "com.vanniktech.maven.publish"