From 435ec4509e37a2e601fae3f696ef5f95bd5c7c83 Mon Sep 17 00:00:00 2001 From: Pawel Pasterz Date: Fri, 12 Mar 2021 10:25:25 +0100 Subject: [PATCH 1/3] Optimize dependencies --- common/build.gradle.kts | 8 ++++---- flank-scripts/build.gradle.kts | 7 ++++--- test_runner/build.gradle.kts | 18 +++++++----------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index d5827a2931..7586b18fa2 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -13,14 +13,14 @@ tasks.test { tasks.withType { kotlinOptions.jvmTarget = "1.8" } dependencies { - implementation(kotlin("stdlib", org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) // or "stdlib-jdk8" +// implementation(kotlin("stdlib", org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) // or "stdlib-jdk8" // Fuel api(Dependencies.Fuel.CORE) - api(Dependencies.Fuel.KOTLINX_SERIALIZATION) - api(Dependencies.Fuel.COROUTINES) +// api(Dependencies.Fuel.KOTLINX_SERIALIZATION) +// api(Dependencies.Fuel.COROUTINES) // Archive api(Dependencies.ARCHIVE_LIB) - api(Dependencies.TUKAANI_XZ) +// api(Dependencies.TUKAANI_XZ) testImplementation(Dependencies.JUNIT) testImplementation(Dependencies.MOCKK) diff --git a/flank-scripts/build.gradle.kts b/flank-scripts/build.gradle.kts index 6070cb0612..30ab0e3b6d 100644 --- a/flank-scripts/build.gradle.kts +++ b/flank-scripts/build.gradle.kts @@ -26,7 +26,7 @@ shadowJar.apply { } } // .. -version = "1.9.1" +version = "1.9.2" group = "com.github.flank" application { @@ -93,14 +93,15 @@ repositories { } dependencies { - implementation(kotlin("stdlib", org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) // or "stdlib-jdk8" +// implementation(kotlin("stdlib", org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) // or "stdlib-jdk8" implementation(Dependencies.KOTLIN_SERIALIZATION) implementation(project(":common")) implementation(Dependencies.CLIKT) - implementation(Dependencies.JSOUP) +// implementation(Dependencies.JSOUP) implementation(Dependencies.JCABI_GITHUB) implementation(Dependencies.SLF4J_NOP) implementation(Dependencies.GLASSFISH_JSON) + implementation(Dependencies.Fuel.COROUTINES) testImplementation(Dependencies.JUNIT) testImplementation(Dependencies.MOCKK) diff --git a/test_runner/build.gradle.kts b/test_runner/build.gradle.kts index 8643330481..bab4f363db 100644 --- a/test_runner/build.gradle.kts +++ b/test_runner/build.gradle.kts @@ -181,7 +181,7 @@ dependencies { implementation(Dependencies.DD_PLIST) implementation(Dependencies.DEX_TEST_PARSER) - implementation(Dependencies.GSON) +// implementation(Dependencies.GSON) implementation(Dependencies.JACKSON_DATABIND) implementation(Dependencies.JACKSON_KOTLIN) @@ -205,26 +205,22 @@ dependencies { implementation(Dependencies.PICOCLI) annotationProcessor(Dependencies.PICOCLI_CODEGEN) - implementation(Dependencies.WOODSTOX) - +// implementation(Dependencies.WOODSTOX) implementation(Dependencies.KOTLIN_LOGGING) + implementation(Dependencies.COMMON_TEXT) + implementation(Dependencies.JANSI) // NOTE: iOS support isn't in the public artifact. Use testing jar generated from the private gcloud CLI json // https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.google.apis%22%20AND%20a%3A%22google-api-services-testing%22 // compile("com.google.apis:google-api-services-testing:v1-rev30-1.23.0") implementation(project(":firebase_apis:test_api")) - implementation(Dependencies.JSOUP) - implementation(Dependencies.OKHTTP) - +// testImplementation(Dependencies.JSOUP) +// testImplementation(Dependencies.OKHTTP) testImplementation(Dependencies.JUNIT) - implementation(Dependencies.SYSTEM_RULES) + testImplementation(Dependencies.SYSTEM_RULES) testImplementation(Dependencies.TRUTH) testImplementation(Dependencies.MOCKK) - - implementation(Dependencies.COMMON_TEXT) - - implementation(Dependencies.JANSI) } buildscript { From a219c8ba359f2cb99ac5ea9a6bb38db0db33d82c Mon Sep 17 00:00:00 2001 From: Pawel Pasterz Date: Fri, 12 Mar 2021 11:30:32 +0100 Subject: [PATCH 2/3] Linting --- common/build.gradle.kts | 6 ------ flank-scripts/build.gradle.kts | 2 -- integration_tests/build.gradle.kts | 1 - test_runner/build.gradle.kts | 9 ++------- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 7586b18fa2..f12c01b065 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -13,14 +13,8 @@ tasks.test { tasks.withType { kotlinOptions.jvmTarget = "1.8" } dependencies { -// implementation(kotlin("stdlib", org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) // or "stdlib-jdk8" - // Fuel api(Dependencies.Fuel.CORE) -// api(Dependencies.Fuel.KOTLINX_SERIALIZATION) -// api(Dependencies.Fuel.COROUTINES) - // Archive api(Dependencies.ARCHIVE_LIB) -// api(Dependencies.TUKAANI_XZ) testImplementation(Dependencies.JUNIT) testImplementation(Dependencies.MOCKK) diff --git a/flank-scripts/build.gradle.kts b/flank-scripts/build.gradle.kts index 30ab0e3b6d..91c626ab80 100644 --- a/flank-scripts/build.gradle.kts +++ b/flank-scripts/build.gradle.kts @@ -93,11 +93,9 @@ repositories { } dependencies { -// implementation(kotlin("stdlib", org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) // or "stdlib-jdk8" implementation(Dependencies.KOTLIN_SERIALIZATION) implementation(project(":common")) implementation(Dependencies.CLIKT) -// implementation(Dependencies.JSOUP) implementation(Dependencies.JCABI_GITHUB) implementation(Dependencies.SLF4J_NOP) implementation(Dependencies.GLASSFISH_JSON) diff --git a/integration_tests/build.gradle.kts b/integration_tests/build.gradle.kts index 17d15b27ef..799ec5ad2d 100644 --- a/integration_tests/build.gradle.kts +++ b/integration_tests/build.gradle.kts @@ -16,7 +16,6 @@ repositories { } dependencies { - implementation(kotlin("stdlib")) implementation(project(":common")) testImplementation(Dependencies.JUNIT) testImplementation(Dependencies.JACKSON_XML) diff --git a/test_runner/build.gradle.kts b/test_runner/build.gradle.kts index bab4f363db..0443d71a17 100644 --- a/test_runner/build.gradle.kts +++ b/test_runner/build.gradle.kts @@ -1,11 +1,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import groovy.util.Node import groovy.util.NodeList -import java.io.ByteArrayOutputStream -import java.nio.file.Paths import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import java.io.ByteArrayOutputStream +import java.nio.file.Paths plugins { application @@ -181,8 +181,6 @@ dependencies { implementation(Dependencies.DD_PLIST) implementation(Dependencies.DEX_TEST_PARSER) -// implementation(Dependencies.GSON) - implementation(Dependencies.JACKSON_DATABIND) implementation(Dependencies.JACKSON_KOTLIN) implementation(Dependencies.JACKSON_YAML) @@ -205,7 +203,6 @@ dependencies { implementation(Dependencies.PICOCLI) annotationProcessor(Dependencies.PICOCLI_CODEGEN) -// implementation(Dependencies.WOODSTOX) implementation(Dependencies.KOTLIN_LOGGING) implementation(Dependencies.COMMON_TEXT) implementation(Dependencies.JANSI) @@ -215,8 +212,6 @@ dependencies { // compile("com.google.apis:google-api-services-testing:v1-rev30-1.23.0") implementation(project(":firebase_apis:test_api")) -// testImplementation(Dependencies.JSOUP) -// testImplementation(Dependencies.OKHTTP) testImplementation(Dependencies.JUNIT) testImplementation(Dependencies.SYSTEM_RULES) testImplementation(Dependencies.TRUTH) From 4005f001eec189879c0e0204e7be427eda2c0bfa Mon Sep 17 00:00:00 2001 From: Pawel Pasterz Date: Fri, 12 Mar 2021 13:18:18 +0100 Subject: [PATCH 3/3] Remove stdlib --- test_runner/build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/test_runner/build.gradle.kts b/test_runner/build.gradle.kts index 0443d71a17..345ecbb20e 100644 --- a/test_runner/build.gradle.kts +++ b/test_runner/build.gradle.kts @@ -181,7 +181,6 @@ dependencies { implementation(Dependencies.DD_PLIST) implementation(Dependencies.DEX_TEST_PARSER) - implementation(Dependencies.JACKSON_DATABIND) implementation(Dependencies.JACKSON_KOTLIN) implementation(Dependencies.JACKSON_YAML) implementation(Dependencies.JACKSON_XML) @@ -195,7 +194,6 @@ dependencies { implementation(Dependencies.KTOR_SERVER_NETTY) implementation(Dependencies.KTOR_GSON) - implementation(Dependencies.KOTLIN_STD_LIB) implementation(Dependencies.KOTLIN_COROUTINES_CORE) implementation(Dependencies.LOGBACK)