From b911f4c1e3cdd4da39dc7996899320727ea545d1 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Sat, 18 Apr 2020 18:32:31 -0700 Subject: [PATCH] Update group id to com.github.flank (#720) * Update group id to com.github.flank * Update POM --- release_notes.md | 1 + test_runner/build.gradle.kts | 47 ++++++++++++++++---- test_runner/buildSrc/src/main/kotlin/Deps.kt | 8 +++- test_runner/settings.gradle.kts | 2 + 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/release_notes.md b/release_notes.md index 54b52238b2..a339102fd2 100644 --- a/release_notes.md +++ b/release_notes.md @@ -1,4 +1,5 @@ ## next (unreleased) +- [#720](https://github.com/Flank/flank/pull/720) Update group id from `flank` to `com.github.flank` ([bootstraponline](https://github.com/bootstraponline)) - [#714](https://github.com/Flank/flank/pull/714) Add support for num-uniform-shards option. ([jan-gogo](https://github.com/jan-gogo)) - [#712](https://github.com/Flank/flank/pull/712) Add keep file path for ios. ([pawelpasterz](https://github.com/pawelpasterz)) - [#711](https://github.com/Flank/flank/pull/711) Remove hardcoded height. ([pawelpasterz](https://github.com/pawelpasterz)) diff --git a/test_runner/build.gradle.kts b/test_runner/build.gradle.kts index 5fedd688e9..e7d1865543 100644 --- a/test_runner/build.gradle.kts +++ b/test_runner/build.gradle.kts @@ -6,18 +6,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.Date import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -group = "test_runner" -version = "SNAPSHOT" - plugins { application jacoco kotlin("jvm") version Versions.KOTLIN id("io.gitlab.arturbosch.detekt") version Versions.DETEKT - id("com.jfrog.bintray") version "1.8.4" + id("com.jfrog.bintray") version Versions.BINTRAY id("maven-publish") - id("com.github.johnrengelman.shadow") version "5.2.0" + id("com.github.johnrengelman.shadow") version Versions.SHADOW } val artifactID = "flank" @@ -54,14 +51,48 @@ bintray { }) } +java { + withJavadocJar() + withSourcesJar() +} + publishing { publications { - register("mavenJava", MavenPublication::class) { - groupId = "flank" - artifactId = "flank" + create("mavenJava") { + groupId = "com.github.flank" + artifactId = artifactID version = System.getenv("MVN_VERSION") artifact(shadowJar) + artifact(tasks["javadocJar"]) + artifact(tasks["sourcesJar"]) + + pom { + name.set("Flank") + description.set("Massively parallel Android and iOS test runner for Firebase Test Lab") + url.set("https://github.com/flank/flank") + + licenses { + license { + name.set("The Apache License, Version 2.0") + url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") + } + } + + developers { + developer { + id.set("bootstraponline") + name.set("bootstrap online") + email.set("code@bootstraponline.com") + } + } + + scm { + connection.set("scm:git:git://github.com/flank/flank.git") + developerConnection.set("scm:git:ssh://github.com:flank/flank.git") + url.set("https://github.com/flank/flank") + } + } pom.withXml { // Remove deps since we're publishing a fat jar diff --git a/test_runner/buildSrc/src/main/kotlin/Deps.kt b/test_runner/buildSrc/src/main/kotlin/Deps.kt index 84aed9574e..70806edf68 100644 --- a/test_runner/buildSrc/src/main/kotlin/Deps.kt +++ b/test_runner/buildSrc/src/main/kotlin/Deps.kt @@ -8,11 +8,17 @@ object Versions { // https://github.com/arturbosch/detekt/releases const val DETEKT = "1.1.0" + // https://github.com/bintray/gradle-bintray-plugin/releases + const val BINTRAY = "1.8.5" + + // https://github.com/johnrengelman/shadow/releases + const val SHADOW = "5.2.0" + // https://github.com/linkedin/dex-test-parser/releases const val DEX_TEST_PARSER = "2.1.1" // match to Tools -> Kotlin -> Configure Kotlin Plugin Updates -> Update Channel: Stable - const val KOTLIN = "1.3.71" + const val KOTLIN = "1.3.72" // https://github.com/Kotlin/kotlinx.coroutines/releases const val KOTLIN_COROUTINES = "1.3.2" diff --git a/test_runner/settings.gradle.kts b/test_runner/settings.gradle.kts index f811f74db8..7caf4a41c0 100644 --- a/test_runner/settings.gradle.kts +++ b/test_runner/settings.gradle.kts @@ -1,2 +1,4 @@ +rootProject.name = "flank" + include(":test_api") project(":test_api").projectDir = File(rootProject.projectDir, "../firebase_apis/test_api")