Skip to content

Commit 040922e

Browse files
authored
Fix KlibDumpFilters factory name (#254)
1 parent daebfc1 commit 040922e

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

api/binary-compatibility-validator.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ public final class kotlinx/validation/api/klib/KlibDumpFilters$Companion {
184184

185185
public final class kotlinx/validation/api/klib/KlibDumpFiltersKt {
186186
public static final fun KLibDumpFilters (Lkotlin/jvm/functions/Function1;)Lkotlinx/validation/api/klib/KlibDumpFilters;
187+
public static final fun KlibDumpFilters (Lkotlin/jvm/functions/Function1;)Lkotlinx/validation/api/klib/KlibDumpFilters;
187188
}
188189

189190
public final class kotlinx/validation/api/klib/KlibDumpKt {

src/main/kotlin/KotlinKlibAbiBuildTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public abstract class KotlinKlibAbiBuildTask : BuildTaskBase() {
5858
outputFile.delete()
5959
outputFile.parentFile.mkdirs()
6060

61-
val dump = KlibDump.fromKlib(klibFile.singleFile, target.get().configurableName, KLibDumpFilters {
61+
val dump = KlibDump.fromKlib(klibFile.singleFile, target.get().configurableName, KlibDumpFilters {
6262
ignoredClasses.addAll(this@KotlinKlibAbiBuildTask.ignoredClasses.get())
6363
ignoredPackages.addAll(this@KotlinKlibAbiBuildTask.ignoredPackages.get())
6464
nonPublicMarkers.addAll(this@KotlinKlibAbiBuildTask.nonPublicMarkers.get())

src/main/kotlin/api/klib/KlibDumpFilters.kt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public class KlibDumpFilters internal constructor(
7878
* Default KLib ABI dump filters which declares no filters
7979
* and uses the latest KLib ABI signature version available.
8080
*/
81-
public val DEFAULT: KlibDumpFilters = KLibDumpFilters {}
81+
public val DEFAULT: KlibDumpFilters = KlibDumpFilters {}
8282
}
8383
}
8484

@@ -89,12 +89,30 @@ public class KlibDumpFilters internal constructor(
8989
* Supplied [KlibDumpFilters.Builder] is valid only during the scope of [builderAction] execution.
9090
*/
9191
@ExperimentalBCVApi
92+
@Deprecated(
93+
"Use KlibDumpFilters instead",
94+
ReplaceWith("KlibDumpFilters(builderAction)"),
95+
DeprecationLevel.WARNING
96+
)
9297
public fun KLibDumpFilters(builderAction: KlibDumpFilters.Builder.() -> Unit): KlibDumpFilters {
9398
val builder = KlibDumpFilters.Builder()
9499
builderAction(builder)
95100
return builder.build()
96101
}
97102

103+
/**
104+
* Builds a new [KlibDumpFilters] instance by invoking a [builderAction] on a temporary
105+
* [KlibDumpFilters.Builder] instance and then converting it into filters.
106+
*
107+
* Supplied [KlibDumpFilters.Builder] is valid only during the scope of [builderAction] execution.
108+
*/
109+
@ExperimentalBCVApi
110+
public fun KlibDumpFilters(builderAction: KlibDumpFilters.Builder.() -> Unit): KlibDumpFilters {
111+
val builder = KlibDumpFilters.Builder()
112+
builderAction(builder)
113+
return builder.build()
114+
}
115+
98116
@ExperimentalBCVApi
99117
@OptIn(ExperimentalLibraryAbiReader::class)
100118
internal fun dumpTo(to: Appendable, klibFile: File, filters: KlibDumpFilters) {

0 commit comments

Comments
 (0)