Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Makefile targets to Gradle tasks #105

Merged
merged 8 commits into from
Feb 10, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cache:
- ${HOME}/.m2

script:
- make test
- ./gradlew preMerge

after_success:
- bash <(curl -s https://codecov.io/bash)
20 changes: 0 additions & 20 deletions Makefile

This file was deleted.

65 changes: 65 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,68 @@ subprojects {
jcenter()
}
}

val installVenv = tasks.register("installVenv", Exec::class.java) {
description = "Install a new virtualenv in ./venv"

outputs.dir("./venv")

commandLine("virtualenv", "venv")
}

val installPreCommit = tasks.register("installPreCommit", Exec::class.java) {
description = "Installs pre-commit in ./venv"

dependsOn(installVenv)

outputs.file("./venv/bin/pre-commit")

commandLine("./venv/bin/pip", "install", "pre-commit")
}

val installHooks = tasks.register("installHooks", Exec::class.java) {
description = "Run pre-commit hooks without installing them"
martinbonnin marked this conversation as resolved.
Show resolved Hide resolved

dependsOn(installPreCommit)

outputs.file(".git/hooks/pre-commit")
inputs.file(".pre-commit-config.yaml")

commandLine("./venv/bin/pre-commit", "install", "--install-hooks")
}

val runHooks = tasks.register("runHooks", Exec::class.java) {
description = "Run pre-commit hooks"

dependsOn(installPreCommit)

commandLine("./venv/bin/pre-commit", "run", "--all-files")
}

val preMerge = tasks.register("preMerge") {
description = "Runs pre-commit hooks, build the plugin and sample and execute tests."

dependsOn(runHooks)
dependsOn(gradle.includedBuild("gradle-plugin").task(":plugin:build"))
dependsOn(gradle.includedBuild("gradle-plugin").task(":plugin:check"))
dependsOn(subprojects.filter { it.name != "samples" }.map { it.tasks.named("assembleDebug") })
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could maybe remove the "assembleDebug" there. The "check" test below already executes testDebugUnitTest and testReleaseUnitTest so it will compile the sources for both debug and release mode.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, let's remove it 👍

dependsOn(subprojects.filter { it.name != "samples" }.map { it.tasks.named("check") })
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't work at the moment, as you have to specify also the mustRunAfter rules. In the current situation you're just saying that preMerge depends on runHooks, :plugin:build, :plugin:check, assembleDebug, check but you're not specifying the order.

This is also the reason why Travis is failing (he's running a one of a sample's check before the generateSwagger).

Copy link
Contributor Author

@martinbonnin martinbonnin Feb 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also the reason why Travis is failing (he's running a one of a sample's check before the generateSwagger).

That was the point of this block int the root build.gradle.kts:

        tasks.all {
            if (name == "assembleDebug") {
                dependsOn(tasks.named("generateSwagger"))
            }
        }

Except I forgot that the generated files are needed before the compile task 🤦‍♂. So at the moment I think there's a race between compileKotlin and generateSwagger, both being dependencies of assembleDebug. I hopefully fixed that here: b0e45e7#diff-392475fdf2bc320d17762ed97109a121R66

}

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 (this is org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
// we need the generated files before we run the kotlin compile task
dependsOn(tasks.named("generateSwagger"))
}
}
}
}
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The check task requires a lot of MetaSpace. Not sure if it is a leak or something else
# But it is needed to make the tasks pass
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2g
21 changes: 4 additions & 17 deletions samples/groovy-android/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
26 changes: 6 additions & 20 deletions samples/junit-tests/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions samples/kotlin-android-moshi-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions samples/kotlin-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
21 changes: 4 additions & 17 deletions samples/kotlin-coroutines/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ pluginManagement {
jcenter()
google()
}

resolutionStrategy {
eachPlugin {
if ("com.android" in requested.id.id) {
Expand Down