Skip to content

Commit e94154b

Browse files
fzhinkinfzhinkin
committed
Make tasks public
1 parent 144c317 commit e94154b

File tree

6 files changed

+55
-22
lines changed

6 files changed

+55
-22
lines changed

‎api/binary-compatibility-validator.api‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,36 @@ public class kotlinx/validation/KotlinApiCompareTask : org/gradle/api/DefaultTas
9191
public final fun setProjectApiFile (Ljava/io/File;)V
9292
}
9393

94+
public abstract class kotlinx/validation/KotlinKlibAbiBuildTask : kotlinx/validation/BuildTaskBase {
95+
public fun <init> ()V
96+
public abstract fun getKlibFile ()Lorg/gradle/api/file/ConfigurableFileCollection;
97+
public abstract fun getOutputAbiFile ()Lorg/gradle/api/file/RegularFileProperty;
98+
public final fun getSignatureVersion ()Lorg/gradle/api/provider/Property;
99+
public abstract fun getTarget ()Lorg/gradle/api/provider/Property;
100+
}
101+
102+
public abstract class kotlinx/validation/KotlinKlibExtractAbiTask : org/gradle/api/DefaultTask {
103+
public fun <init> ()V
104+
public abstract fun getInputAbiFile ()Lorg/gradle/api/file/RegularFileProperty;
105+
public abstract fun getOutputAbiFile ()Lorg/gradle/api/file/RegularFileProperty;
106+
public abstract fun getRequiredTargets ()Lorg/gradle/api/provider/ListProperty;
107+
public final fun getStrictValidation ()Lorg/gradle/api/provider/Property;
108+
}
109+
110+
public abstract class kotlinx/validation/KotlinKlibInferAbiTask : org/gradle/api/DefaultTask {
111+
public fun <init> ()V
112+
public abstract fun getInputDumps ()Lorg/gradle/api/provider/ListProperty;
113+
public abstract fun getOldMergedKlibDump ()Lorg/gradle/api/file/RegularFileProperty;
114+
public abstract fun getOutputAbiFile ()Lorg/gradle/api/file/RegularFileProperty;
115+
public abstract fun getTarget ()Lorg/gradle/api/provider/Property;
116+
}
117+
118+
public abstract class kotlinx/validation/KotlinKlibMergeAbiTask : org/gradle/api/DefaultTask {
119+
public fun <init> ()V
120+
public abstract fun getDumps ()Lorg/gradle/api/provider/ListProperty;
121+
public abstract fun getMergedApiFile ()Lorg/gradle/api/file/RegularFileProperty;
122+
}
123+
94124
public final class kotlinx/validation/_UtilsKt {
95125
public static final fun toKlibTarget (Lorg/jetbrains/kotlin/gradle/plugin/KotlinTarget;)Lkotlinx/validation/api/klib/KlibTarget;
96126
}

‎src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ private class KlibValidationPipelineBuilder(
539539
val buildTargetAbi = configureKlibCompilation(mainCompilation, extension, targetConfig,
540540
target, apiBuildDir)
541541
generatedDumps.add(GeneratedDump(target,
542-
objects.fileProperty().also { it.set(buildTargetAbi.flatMap { it.outputApiFile }) }))
542+
objects.fileProperty().also { it.set(buildTargetAbi.flatMap { it.outputAbiFile }) }))
543543
return@configureEach
544544
}
545545
// If the target is unsupported, the regular merge task will only depend on a task complaining about
@@ -559,7 +559,7 @@ private class KlibValidationPipelineBuilder(
559559
proxy.configure { it.inputDumps.addAll(generatedDumps) }
560560
inferredDumps.add(GeneratedDump(currentTarget.toKlibTarget(),
561561
objects.fileProperty().also {
562-
it.set(proxy.flatMap { it.outputApiFile })
562+
it.set(proxy.flatMap { it.outputAbiFile })
563563
}))
564564
}
565565
}
@@ -620,7 +620,7 @@ private class KlibValidationPipelineBuilder(
620620
this.target.set(target)
621621
klibFile.from(project.provider { compilation.output.classesDirs })
622622
signatureVersion.set(extension.klib.signatureVersion)
623-
outputApiFile.set(apiBuildDir.resolve(klibDumpFileName))
623+
outputAbiFile.set(apiBuildDir.resolve(klibDumpFileName))
624624
}
625625
return buildTask
626626
}
@@ -653,7 +653,7 @@ private class KlibValidationPipelineBuilder(
653653
group = "other"
654654
target.set(unsupportedTarget)
655655
oldMergedKlibDump.set(klibApiDir.get().resolve(klibDumpFileName))
656-
outputApiFile.set(apiBuildDir.resolve(klibDumpFileName))
656+
outputAbiFile.set(apiBuildDir.resolve(klibDumpFileName))
657657
}
658658
}
659659
}

‎src/main/kotlin/KotlinKlibAbiBuildTask.kt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ import org.gradle.api.tasks.TaskAction
1717
/**
1818
* Generates a text file with a KLib ABI dump for a single klib.
1919
*/
20-
internal abstract class KotlinKlibAbiBuildTask : BuildTaskBase() {
21-
@get:OutputFile
22-
public abstract val outputApiFile: RegularFileProperty
20+
public abstract class KotlinKlibAbiBuildTask : BuildTaskBase() {
2321

2422
/**
25-
* Collection consisting of a single path to compiled klib (either file, or directory).
23+
* Collection consisting of a single path to a compiled klib (either file, or directory).
2624
*/
2725
@get:InputFiles
2826
public abstract val klibFile: ConfigurableFileCollection
@@ -41,10 +39,16 @@ internal abstract class KotlinKlibAbiBuildTask : BuildTaskBase() {
4139
@get:Input
4240
public abstract val target: Property<KlibTarget>
4341

42+
/**
43+
* A path to the resulting dump file.
44+
*/
45+
@get:OutputFile
46+
public abstract val outputAbiFile: RegularFileProperty
47+
4448
@OptIn(ExperimentalBCVApi::class)
4549
@TaskAction
4650
internal fun generate() {
47-
val outputFile = outputApiFile.asFile.get()
51+
val outputFile = outputAbiFile.asFile.get()
4852
outputFile.delete()
4953
outputFile.parentFile.mkdirs()
5054

‎src/main/kotlin/KotlinKlibExtractAbiTask.kt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,13 @@ import org.gradle.api.tasks.*
2020
* If some targets the dump stored in a project directory was generated for are not supported by the host compiler,
2121
* only supported tasks could be extracted for further validation.
2222
*/
23-
internal abstract class KotlinKlibExtractAbiTask : DefaultTask() {
24-
23+
public abstract class KotlinKlibExtractAbiTask : DefaultTask() {
2524
/**
2625
* Merged KLib dump that should be filtered by this task.
2726
*/
2827
@get:InputFile
2928
public abstract val inputAbiFile: RegularFileProperty
3029

31-
/**
32-
* A path to the resulting dump file.
33-
*/
34-
@get:OutputFile
35-
public abstract val outputAbiFile: RegularFileProperty
36-
3730
/**
3831
* List of the targets that the resulting dump should contain.
3932
*/
@@ -46,6 +39,12 @@ internal abstract class KotlinKlibExtractAbiTask : DefaultTask() {
4639
@get:Input
4740
public val strictValidation: Property<Boolean> = project.objects.property(Boolean::class.java).convention(false)
4841

42+
/**
43+
* A path to the resulting dump file.
44+
*/
45+
@get:OutputFile
46+
public abstract val outputAbiFile: RegularFileProperty
47+
4948
@OptIn(ExperimentalBCVApi::class)
5049
@TaskAction
5150
internal fun generate() {

‎src/main/kotlin/KotlinKlibInferAbiTask.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.gradle.api.tasks.*
2323
* from it and merged into the common ABI extracted previously.
2424
* The resulting dump is then used as an inferred dump for the unsupported target.
2525
*/
26-
internal abstract class KotlinKlibInferAbiTask : DefaultTask() {
26+
public abstract class KotlinKlibInferAbiTask : DefaultTask() {
2727
/**
2828
* The name of a target to infer a dump for.
2929
*/
@@ -46,7 +46,7 @@ internal abstract class KotlinKlibInferAbiTask : DefaultTask() {
4646
* A path to an inferred dump file.
4747
*/
4848
@get:OutputFile
49-
public abstract val outputApiFile: RegularFileProperty
49+
public abstract val outputAbiFile: RegularFileProperty
5050

5151
@OptIn(ExperimentalBCVApi::class)
5252
@TaskAction
@@ -80,7 +80,7 @@ internal abstract class KotlinKlibInferAbiTask : DefaultTask() {
8080
}
8181
}
8282

83-
inferAbi(target.get(), supportedTargetDumps, image).saveTo(outputApiFile.asFile.get())
83+
inferAbi(target.get(), supportedTargetDumps, image).saveTo(outputAbiFile.asFile.get())
8484

8585
logger.warn(
8686
"An ABI dump for target ${target.get()} was inferred from the ABI generated for the following targets " +

‎src/main/kotlin/KotlinKlibMergeAbiTask.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.gradle.api.tasks.*
1515
/**
1616
* Merges multiple individual KLib ABI dumps into a single merged dump.
1717
*/
18-
internal abstract class KotlinKlibMergeAbiTask : DefaultTask() {
18+
public abstract class KotlinKlibMergeAbiTask : DefaultTask() {
1919
/**
2020
* Dumps to merge.
2121
*
@@ -26,7 +26,7 @@ internal abstract class KotlinKlibMergeAbiTask : DefaultTask() {
2626
public abstract val dumps: ListProperty<GeneratedDump>
2727

2828
/**
29-
* A path to a resulting merged dump.
29+
* A path to a resulting merged dump file.
3030
*/
3131
@get:OutputFile
3232
public abstract val mergedApiFile: RegularFileProperty

0 commit comments

Comments
 (0)