Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Commit

Permalink
Merge pull request #17 from staktrace/bom
Browse files Browse the repository at this point in the history
Clean up kotlin dependencies and BOM
  • Loading branch information
chris-ryan-square authored Jul 18, 2022
2 parents 59c1470 + bd23d32 commit a108189
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
13 changes: 10 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ buildscript {
}

dependencies {
classpath(Dependencies.kotlinAllOpenPlugin)
classpath(Dependencies.kotlinGradlePlugin)
classpath(Dependencies.kotlinNoArgPlugin)
classpath(Dependencies.junitGradlePlugin)
classpath(Dependencies.mavenPublishGradlePlugin)
classpath(Dependencies.protobufGradlePlugin)
Expand Down Expand Up @@ -55,8 +53,17 @@ subprojects {
add("api", enforcedPlatform(project(":wisp-bom")))
add("api", platform(Dependencies.grpcBom))
add("api", platform(Dependencies.jacksonBom))
add("api", platform(Dependencies.kotlinBom))
add("api", platform(Dependencies.nettyBom))

// The kotlin API surface used in this library is not exposed via
// the external API, so we shouldn't be forcing downstream consumers
// to use a particular kotlin version. Doing this can cause compilation
// failures for downstream repositories that want to use wisp APIs
// in their buildscripts or plugins but still want to use an older
// version of the kotlin compiler. Use 'implementation' instead of 'api'
// so that we're not forcing downstream consumers to adopt our kotlin
// BOM versions.
add("implementation", platform(Dependencies.kotlinBom))
}

tasks.withType<GenerateModuleMetadata> {
Expand Down
8 changes: 3 additions & 5 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ object Dependencies {
val kotestAssertions = "io.kotest:kotest-assertions-core:5.3.2"
val kotestJunitRunnerJvm = "io.kotest:kotest-runner-junit5-jvm:5.3.2"
val kotestProperty = "io.kotest:kotest-property:5.3.2"
val kotlinAllOpenPlugin = "org.jetbrains.kotlin:kotlin-allopen:1.7.0"
val kotlinBinaryCompatibilityPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:0.10.1"
val kotlinBom = "org.jetbrains.kotlin:kotlin-bom:1.7.0"
val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
val kotlinNoArgPlugin = "org.jetbrains.kotlin:kotlin-noarg:1.7.0"
val kotlinReflection = "org.jetbrains.kotlin:kotlin-reflect:1.7.0"
val kotlinReflection = "org.jetbrains.kotlin:kotlin-reflect"
val kotlinRetry = "com.michael-bull.kotlin-retry:kotlin-retry:1.0.9"
val kotlinStdLibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0"
val kotlinTest = "org.jetbrains.kotlin:kotlin-test:1.7.0"
val kotlinStdLibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
val kotlinTest = "org.jetbrains.kotlin:kotlin-test"
val kotlinxCoroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3"
val launchDarkly = "com.launchdarkly:launchdarkly-java-server-sdk:5.8.1"
val logbackClassic = "ch.qos.logback:logback-classic:1.2.3"
Expand Down

0 comments on commit a108189

Please sign in to comment.