Skip to content

Commit 86e5463

Browse files
committed
Remove japicmp task and config in favor of Roseau (#5126)
(cherry picked from commit b7084ce)
1 parent dba3543 commit 86e5463

12 files changed

+2
-257
lines changed

gradle/config/japicmp/accepted-breaking-changes.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ download = { id = "de.undercouch.download", version = "5.6.0" }
9999
errorProne = { id = "net.ltgt.errorprone", version = "4.3.0" }
100100
foojayResolver = { id = "org.gradle.toolchains.foojay-resolver", version = "1.0.0" }
101101
gitPublish = { id = "org.ajoberstar.git-publish", version = "5.1.3" }
102-
japicmp = { id = "me.champeau.gradle.japicmp", version = "0.4.6" }
103102
jmh = { id = "me.champeau.jmh", version = "0.7.3" }
104103
jreleaser = { id = "org.jreleaser", version = "1.20.0" }
105104
# check if workaround in gradle.properties can be removed when updating

gradle/plugins/backward-compatibility/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ plugins {
88
dependencies {
99
implementation("junitbuild.base:dsl-extensions")
1010
implementation(libs.plugins.download.markerCoordinates)
11-
implementation(libs.plugins.japicmp.markerCoordinates)
1211
implementation(libs.jackson.dataformat.yaml)
1312
}
1413

Lines changed: 2 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11

22
import de.undercouch.gradle.tasks.download.Download
33
import junitbuild.compatibility.BackwardCompatibilityChecksExtension
4-
import junitbuild.compatibility.japicmp.AcceptedViolationSuppressor
5-
import junitbuild.compatibility.japicmp.AcceptedViolationsPostProcessRule
6-
import junitbuild.compatibility.japicmp.BreakingSuperClassChangeRule
7-
import junitbuild.compatibility.japicmp.InternalApiFilter
8-
import junitbuild.compatibility.japicmp.SourceIncompatibleRule
94
import junitbuild.compatibility.roseau.RoseauDiff
105
import junitbuild.extensions.dependencyFromLibs
11-
import junitbuild.extensions.javaModuleName
12-
import me.champeau.gradle.japicmp.JapicmpTask
13-
import me.champeau.gradle.japicmp.report.stdrules.BinaryIncompatibleRule
14-
import me.champeau.gradle.japicmp.report.stdrules.RecordSeenMembersSetup
15-
import org.gradle.internal.os.OperatingSystem
166

177
plugins {
188
java
199
id("de.undercouch.download")
20-
id("me.champeau.gradle.japicmp")
2110
}
2211

2312
val roseauDependencies = configurations.dependencyScope("roseau")
@@ -38,16 +27,6 @@ dependencies {
3827

3928
val extension = extensions.create<BackwardCompatibilityChecksExtension>("backwardCompatibilityChecks").apply {
4029
enabled.convention(true)
41-
acceptedIncompatibilities.apply {
42-
val acceptedBreakingChangesFile = rootProject.layout.projectDirectory.file("gradle/config/japicmp/accepted-breaking-changes.txt")
43-
if (acceptedBreakingChangesFile.asFile.exists()) {
44-
convention(providers.fileContents(acceptedBreakingChangesFile).asText
45-
.map { it.lineSequence().filter { line -> line.startsWith(project.javaModuleName) }.toList() })
46-
} else {
47-
empty()
48-
}
49-
finalizeValueOnRead()
50-
}
5130
previousVersion.apply {
5231
convention(providers.gradleProperty("apiBaselineVersion"))
5332
finalizeValueOnRead()
@@ -61,7 +40,7 @@ val downloadPreviousReleaseJar by tasks.registering(Download::class) {
6140
onlyIf { extension.enabled.get() }
6241
val previousVersion = extension.previousVersion.get()
6342
src("https://repo1.maven.org/maven2/${project.group.toString().replace(".", "/")}/${project.name}/$previousVersion/${project.name}-$previousVersion.jar")
64-
dest(layout.buildDirectory.dir("japicmp"))
43+
dest(layout.buildDirectory.dir("previousRelease"))
6544
overwrite(false)
6645
quiet(true)
6746
retries(2)
@@ -89,48 +68,10 @@ val roseau by tasks.registering(RoseauDiff::class) {
8968
reportDir = layout.buildDirectory.dir("reports/roseau")
9069
}
9170

92-
val japicmp by tasks.registering(JapicmpTask::class) {
93-
if (gradle.startParameter.isOffline) {
94-
enabled = false
95-
}
96-
onlyIf { extension.enabled.get() }
97-
shouldRunAfter(roseau)
98-
99-
oldClasspath.from(downloadPreviousReleaseJar.map { it.outputFiles })
100-
newClasspath.from(tasks.jar)
101-
onlyModified = true
102-
ignoreMissingClasses = true
103-
htmlOutputFile = layout.buildDirectory.file("reports/japicmp/plain-report.html")
104-
addExcludeFilter(InternalApiFilter::class.java)
105-
packageExcludes.add("*.shadow.*")
106-
inputs.property("acceptedIncompatibilities", extension.acceptedIncompatibilities)
107-
richReport {
108-
title = "Compatibility report"
109-
description = extension.previousVersion.map { "and source compatibility compared against $it" }
110-
destinationDir = layout.buildDirectory.dir("reports/japicmp")
111-
addSetupRule(RecordSeenMembersSetup::class.java)
112-
addRule(BreakingSuperClassChangeRule::class.java)
113-
addRule(BinaryIncompatibleRule::class.java)
114-
addRule(SourceIncompatibleRule::class.java)
115-
}
116-
}
117-
11871
val checkBackwardCompatibility by tasks.registering {
119-
dependsOn(roseau, japicmp)
72+
dependsOn(roseau)
12073
}
12174

12275
tasks.check {
12376
dependsOn(checkBackwardCompatibility)
12477
}
125-
126-
afterEvaluate {
127-
val params = mapOf(
128-
"acceptedIncompatibilities" to extension.acceptedIncompatibilities.get().joinToString(",")
129-
)
130-
japicmp {
131-
richReport {
132-
addViolationTransformer(AcceptedViolationSuppressor::class.java, params)
133-
addPostProcessRule(AcceptedViolationsPostProcessRule::class.java, params)
134-
}
135-
}
136-
}
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package junitbuild.compatibility
22

33
import org.gradle.api.provider.Property
4-
import org.gradle.api.provider.SetProperty
54

65
abstract class BackwardCompatibilityChecksExtension {
76

87
abstract val enabled: Property<Boolean>
98

109
abstract val previousVersion: Property<String>
1110

12-
abstract val acceptedIncompatibilities: SetProperty<String>
13-
1411
}

gradle/plugins/backward-compatibility/src/main/kotlin/junitbuild/compatibility/japicmp/AcceptedViolationSuppressor.kt

Lines changed: 0 additions & 43 deletions
This file was deleted.

gradle/plugins/backward-compatibility/src/main/kotlin/junitbuild/compatibility/japicmp/AcceptedViolationsPostProcessRule.kt

Lines changed: 0 additions & 32 deletions
This file was deleted.

gradle/plugins/backward-compatibility/src/main/kotlin/junitbuild/compatibility/japicmp/BreakingSuperClassChangeRule.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

gradle/plugins/backward-compatibility/src/main/kotlin/junitbuild/compatibility/japicmp/InternalApiFilter.kt

Lines changed: 0 additions & 51 deletions
This file was deleted.

gradle/plugins/backward-compatibility/src/main/kotlin/junitbuild/compatibility/japicmp/JApiCompatibilityExtensions.kt

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)