Skip to content

Commit e9fde92

Browse files
authored
refactor: Fix up build plugin & dependencies structure (#33)
Signed-off-by: Eric Deandrea <eric.deandrea@ibm.com>
1 parent f926021 commit e9fde92

File tree

8 files changed

+21
-23
lines changed

8 files changed

+21
-23
lines changed

.github/project.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
release:
2+
current-version: 0.0.1
3+
next-version: 999-SNAPSHOT

api/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ plugins {
44

55
dependencies {
66
implementation(platform(libs.jackson.bom))
7-
8-
implementation("com.fasterxml.jackson.core:jackson-annotations")
7+
implementation(libs.jackson.annotations)
98
testImplementation(project(":docling-testcontainers"))
109
}

buildSrc/src/main/kotlin/docling-java-shared.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
plugins {
2+
id("docling-shared")
23
`java-library`
34
`maven-publish`
45
}
56

6-
group = "ai.docling"
7-
version = property("version").toString()
8-
97
repositories {
108
mavenCentral()
119
}
@@ -69,7 +67,7 @@ dependencies {
6967
// These dependencies are used internally, and not exposed to consumers on their own compile classpath.
7068
testImplementation(platform(libs.findLibrary("junit.bom").get()))
7169
testImplementation(libs.findLibrary("junit.jupiter").get())
72-
testImplementation(libs.findBundle("assertj").get())
70+
testImplementation(libs.findLibrary("assertj-core").get())
7371
testRuntimeOnly(libs.findLibrary("junit.platform").get())
7472
}
7573

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
group = "ai.docling"
2+
version = property("version").toString()

client/build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ plugins {
33
}
44

55
dependencies {
6-
implementation(platform(libs.jackson.bom))
7-
implementation(platform(libs.testcontainers.bom))
8-
6+
api(platform(libs.jackson.bom))
97
api(project(":docling-api"))
10-
api("tools.jackson.core:jackson-databind")
8+
api(libs.jackson.databind)
119

12-
testImplementation("org.testcontainers:testcontainers-junit-jupiter")
10+
testImplementation(platform(libs.testcontainers.bom))
11+
testImplementation(libs.testcontainers.junit.jupiter)
1312
testImplementation(project(":docling-testcontainers"))
1413
}

docs/build.gradle.kts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
plugins {
2-
id("docling-java-shared")
2+
id("docling-shared")
33
id("ru.vyarus.mkdocs") version "4.0.1"
44
}
55

6-
dependencies {
7-
compileOnly(project(":docling-api"))
8-
compileOnly(project(":docling-client"))
9-
compileOnly(project(":docling-testing"))
10-
compileOnly(project(":docling-testcontainers"))
11-
}
12-
136
python {
147
pip(
158
"mkdocs:1.6.1",
@@ -36,6 +29,10 @@ mkdocs {
3629
)
3730
}
3831

32+
tasks.register("build") {
33+
dependsOn(tasks.named("mkdocsBuild"))
34+
}
35+
3936
tasks.withType<PublishToMavenRepository>().configureEach {
4037
enabled = false
4138
}

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter" }
1111
junit-platform = { group = "org.junit.platform", name = "junit-platform-launcher" }
1212
assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" }
1313
jackson-bom = { group = "tools.jackson", name = "jackson-bom", version.ref = "jackson" }
14+
jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations" }
15+
jackson-databind = { group = "tools.jackson.core", name = "jackson-databind" }
1416
jspecify = { group = "org.jspecify", name = "jspecify", version.ref = "jspecify" }
1517
testcontainers-bom = { group = "org.testcontainers", name = "testcontainers-bom", version.ref = "testcontainers"}
16-
17-
[bundles]
18-
assertj = ["assertj-core"]
18+
testcontainers-junit-jupiter = { group = "org.testcontainers", name = "testcontainers-junit-jupiter" }

testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ plugins {
55
dependencies {
66
api(platform(libs.junit.bom))
77
api(libs.junit.jupiter)
8-
api(libs.bundles.assertj)
8+
api(libs.assertj.core)
99
}

0 commit comments

Comments
 (0)