Skip to content

Commit 2fcecf2

Browse files
committed
chore: only apply lombok to java modules and remove testFixtures
1 parent f2556c6 commit 2fcecf2

File tree

8 files changed

+16
-35
lines changed

8 files changed

+16
-35
lines changed

Diff for: api/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// In this section you declare the dependencies for your production and test code
21
dependencies {
32

43
}

Diff for: build.gradle.kts

+12-23
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
plugins {
33
signing
44
`java-library`
5-
`java-test-fixtures`
65
`maven-publish`
76
id("io.freefair.lombok") version "6.3.0"
87
}
@@ -23,16 +22,17 @@ subprojects {
2322
apply(plugin = "signing")
2423
apply(plugin = "java-library")
2524
apply(plugin = "maven-publish")
26-
apply(plugin = "io.freefair.lombok")
27-
apply(plugin = "java-test-fixtures")
2825

2926
base {
3027
archivesBaseName = artifactId
3128
}
3229

33-
lombok {
34-
version.set("1.18.22")
35-
disableConfig.set(true)
30+
if (!project.name.contains("kotlin")) {
31+
apply(plugin = "io.freefair.lombok")
32+
lombok {
33+
version.set("1.18.22")
34+
disableConfig.set(true)
35+
}
3636
}
3737

3838
// Source Compatibility
@@ -96,10 +96,13 @@ subprojects {
9696
}
9797

9898
// javadoc & delombok
99-
val delombok by getting(io.freefair.gradle.plugins.lombok.tasks.Delombok::class)
10099
javadoc {
101-
dependsOn(delombok)
102-
source(delombok)
100+
if (!project.name.contains("kotlin")) {
101+
val delombok by getting(io.freefair.gradle.plugins.lombok.tasks.Delombok::class)
102+
dependsOn(delombok)
103+
source(delombok)
104+
}
105+
103106
options {
104107
title = "${project.artifactId} (v${project.version})"
105108
windowTitle = "${project.artifactId} (v${project.version})"
@@ -116,17 +119,3 @@ subprojects {
116119
}
117120
}
118121
}
119-
120-
tasks.register<Javadoc>("aggregateJavadoc") {
121-
group = JavaBasePlugin.DOCUMENTATION_GROUP
122-
options {
123-
title = "${rootProject.name} (v${project.version})"
124-
windowTitle = "${rootProject.name} (v${project.version})"
125-
encoding = "UTF-8"
126-
}
127-
128-
source(subprojects.map { it.tasks.delombok.get() })
129-
classpath = files(subprojects.map { it.sourceSets["main"].compileClasspath })
130-
131-
setDestinationDir(file("${rootDir}/docs/static/javadoc"))
132-
}

Diff for: core/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// In this section you declare the dependencies for your production and test code
21
dependencies {
32
// Project
43
api(project(":api"))

Diff for: handler-reactor/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
// In this section you declare the dependencies for your production and test code
21
dependencies {
32
// Project
43
api(project(":api"))
54
testImplementation(project(":core"))
6-
testImplementation(testFixtures(project(":core")))
75

86
// Reactor - see https://repo1.maven.org/maven2/io/projectreactor/reactor-bom/Dysprosium-SR12/reactor-bom-Dysprosium-SR12.pom
97
api(group = "io.projectreactor", name = "reactor-core", version = "3.4.14")

Diff for: handler-simple/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
// In this section you declare the dependencies for your production and test code
21
dependencies {
32
// Project
43
api(project(":api"))
54
testImplementation(project(":core"))
6-
testImplementation(testFixtures(project(":core")))
75
}
86

97
publishing.publications.withType<MavenPublication> {

Diff for: handler-spring/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
// In this section you declare the dependencies for your production and test code
21
dependencies {
32
// Project
43
api(project(":api"))
54
testImplementation(project(":core"))
6-
testImplementation(testFixtures(project(":core")))
75

86
// Spring
97
implementation(group = "org.springframework.boot", name = "spring-boot-starter", version = "2.6.3")

Diff for: kotlin/build.gradle.kts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// In this section you declare the dependencies for your production and test code
1+
plugins {
2+
kotlin("jvm") version "1.6.0"
3+
}
4+
25
dependencies {
36
// Project
47
api(project(":api"))
@@ -8,7 +11,6 @@ dependencies {
811
testImplementation(group = "org.jetbrains.kotlinx", name="kotlinx-coroutines-test", version = "1.6.0")
912
testImplementation(project(":core"))
1013
testImplementation(project(":handler-simple"))
11-
testImplementation(testFixtures(project(":core")))
1214
}
1315

1416
tasks.test {

Diff for: kotlin/src/test/java/com/github/philippheuer/events4j/kotlin/EventManagerExtensionsTest.kt

-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ package com.github.philippheuer.events4j.kotlin
33
import com.github.philippheuer.events4j.core.EventManager
44
import kotlinx.coroutines.*
55
import kotlinx.coroutines.test.*
6-
import lombok.extern.slf4j.Slf4j
76
import org.junit.jupiter.api.*
87
import org.junit.jupiter.api.Assertions.*
98

109

1110
@ExperimentalCoroutinesApi
12-
@Slf4j
1311
class EventManagerExtensionsTest {
1412

1513
@Test

0 commit comments

Comments
 (0)