Skip to content

Commit b5d7a49

Browse files
Tested and working locally, need to trigger a CI run to validate end-to-end (#109)
1 parent bf53343 commit b5d7a49

3 files changed

Lines changed: 15 additions & 12 deletions

File tree

build.gradle.kts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ plugins {
33
kotlin("jvm") version libs.versions.kotlin
44
kotlin("kapt") version libs.versions.kotlin
55
id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
6+
id("org.jetbrains.dokka") version "1.9.20" apply false
7+
}
8+
9+
buildscript {
10+
configurations.all {
11+
resolutionStrategy.eachDependency {
12+
if (requested.group.startsWith("com.fasterxml.jackson")) {
13+
useVersion("2.19.1")
14+
}
15+
}
16+
}
617
}
718

819
subprojects {
@@ -20,19 +31,11 @@ allprojects {
2031
// Dependabot forces
2132
force("com.fasterxml.woodstox:woodstox-core:6.4.0")
2233
force("com.google.guava:guava:32.0.1-jre")
23-
force("com.fasterxml.jackson.core:jackson-core:2.15.0")
24-
force("com.fasterxml.jackson.core:jackson-databind:2.15.2")
2534
force("ch.qos.logback:logback-core:1.3.15")
2635
}
2736
}
2837
}
2938

30-
buildscript {
31-
dependencies {
32-
classpath(libs.dokka)
33-
}
34-
}
35-
3639
repositories {
3740
mavenCentral()
3841
}

stytch/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ kotlin {
3030
explicitApi()
3131
}
3232

33-
val dokkaHtml by tasks.getting(org.jetbrains.dokka.gradle.DokkaTask::class)
33+
val dokkaJavadoc by tasks.getting(org.jetbrains.dokka.gradle.DokkaTask::class)
3434
val javadocJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
35-
dependsOn(dokkaHtml)
35+
dependsOn(dokkaJavadoc)
3636
archiveClassifier.set("javadoc")
37-
from(dokkaHtml.outputDirectory)
37+
from(dokkaJavadoc.outputDirectory)
3838
}
3939

4040
// Configure module publishing

version.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "7.20.1"
1+
version = "7.20.4"

0 commit comments

Comments
 (0)