centralize loading plugins in the classpath in the root build.gradle.…

…kts. This makes KotlinCompile visible from the root projet. Use that to make all KotlinCompile tasks depend on GenerateSwagger
Yelp · Feb 8, 2020 · b0e45e7 · b0e45e7
1 parent 353af93
commit b0e45e7
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 62 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -53,10 +53,17 @@ val preMerge = tasks.register("preMerge") {
     dependsOn(subprojects.filter { it.name != "samples" }.map { it.tasks.named("check") })
 }
 
+plugins {
+    id("com.android.library").version("3.5.3").apply(false)
+    id("com.yelp.codegen.plugin").version("1.3.0").apply(false)
+    id("io.gitlab.arturbosch.detekt").version("1.4.0").apply(false)
+    kotlin("android").version("1.3.61").apply(false)
+}
+
 subprojects {
     afterEvaluate { // Remove when we have lazy configuration
         tasks.all {
-            if (name == "assembleDebug") {
+            if (this is org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
                 // assembleDebug needs the generated files
                 dependsOn(tasks.named("generateSwagger"))
             }

diff --git a/samples/groovy-android/build.gradle b/samples/groovy-android/build.gradle
@@ -1,22 +1,9 @@
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:3.5.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
-        classpath "com.yelp.codegen:plugin:1.3.0"
-    }
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("com.yelp.codegen.plugin")
 }
 
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-apply plugin: "com.yelp.codegen.plugin"
-
 android {
     compileSdkVersion = 28
     defaultConfig {

diff --git a/samples/junit-tests/build.gradle b/samples/junit-tests/build.gradle
@@ -1,25 +1,11 @@
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:3.5.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
-        classpath "com.yelp.codegen:plugin:1.3.0"
-        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.4.0"
-    }
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("com.yelp.codegen.plugin")
+    id("io.gitlab.arturbosch.detekt")
+    id("kotlin-kapt")
 }
 
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-apply plugin: "com.yelp.codegen.plugin"
-apply plugin: "io.gitlab.arturbosch.detekt"
-apply plugin: "kotlin-kapt"
-
 android {
     compileSdkVersion = 28
     defaultConfig {

diff --git a/samples/kotlin-android-moshi-codegen/build.gradle.kts b/samples/kotlin-android-moshi-codegen/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    id("com.android.library") version "3.5.3"
-    kotlin("android") version "1.3.61"
-    id("com.yelp.codegen.plugin") version "1.3.0"
-    kotlin("kapt") version "1.3.61"
+    id("com.android.library")
+    id("kotlin-android")
+    id("com.yelp.codegen.plugin")
+    id("kotlin-kapt")
 }
 
 android {

diff --git a/samples/kotlin-android/build.gradle.kts b/samples/kotlin-android/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    id("com.android.library") version "3.5.3"
-    kotlin("android") version "1.3.61"
-    id("com.yelp.codegen.plugin") version "1.3.0"
+    id("com.android.library")
+    kotlin("android")
+    id("com.yelp.codegen.plugin")
 }
 
 android {

diff --git a/samples/kotlin-coroutines/build.gradle b/samples/kotlin-coroutines/build.gradle
@@ -1,22 +1,9 @@
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:3.5.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
-        classpath "com.yelp.codegen:plugin:1.3.0"
-    }
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("com.yelp.codegen.plugin")
 }
 
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-apply plugin: "com.yelp.codegen.plugin"
-
 android {
     compileSdkVersion = 28
     defaultConfig {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -7,6 +7,7 @@ pluginManagement {
         jcenter()
         google()
     }
+
     resolutionStrategy {
         eachPlugin {
             if ("com.android" in requested.id.id) {