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.

Sign up for GitHub

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

refactor: Clean up dependencies #1696

Merged
merged 3 commits into from
Mar 15, 2021
Merged

refactor: Clean up dependencies #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
435ec45
Optimize dependencies
pawelpasterz Mar 12, 2021
a219c8b
Linting
pawelpasterz Mar 12, 2021
4005f00
Remove stdlib
pawelpasterz Mar 12, 2021
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
6 changes: 0 additions & 6 deletions common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,8 @@ tasks.test {
tasks.withType<KotlinCompile> { 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)
Expand Down
5 changes: 2 additions & 3 deletions flank-scripts/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ shadowJar.apply {
}
}
// <breaking change>.<feature added>.<fix/minor change>
version = "1.9.1"
version = "1.9.2"
group = "com.github.flank"

application {
Expand Down Expand Up @@ -93,14 +93,13 @@ 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)
implementation(Dependencies.Fuel.COROUTINES)

testImplementation(Dependencies.JUNIT)
testImplementation(Dependencies.MOCKK)
Expand Down
1 change: 0 additions & 1 deletion integration_tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ repositories {
}

dependencies {
implementation(kotlin("stdlib"))
implementation(project(":common"))
testImplementation(Dependencies.JUNIT)
testImplementation(Dependencies.JACKSON_XML)
Expand Down
21 changes: 5 additions & 16 deletions test_runner/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -181,9 +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)
implementation(Dependencies.JACKSON_XML)
Expand All @@ -197,34 +194,26 @@ dependencies {
implementation(Dependencies.KTOR_SERVER_NETTY)
implementation(Dependencies.KTOR_GSON)

implementation(Dependencies.KOTLIN_STD_LIB)
implementation(Dependencies.KOTLIN_COROUTINES_CORE)

implementation(Dependencies.LOGBACK)

implementation(Dependencies.PICOCLI)
annotationProcessor(Dependencies.PICOCLI_CODEGEN)

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.JUNIT)
implementation(Dependencies.SYSTEM_RULES)
testImplementation(Dependencies.SYSTEM_RULES)
testImplementation(Dependencies.TRUTH)
testImplementation(Dependencies.MOCKK)

implementation(Dependencies.COMMON_TEXT)

implementation(Dependencies.JANSI)
}

buildscript {
Expand Down