Skip to content

Commit eeadf0f

Browse files
authored
[Konvert] Convert Templates class to Kotlin (#41)
This is a straight conversion with no functionality changes. Extracted from #29.
1 parent a3e2d84 commit eeadf0f

File tree

4 files changed

+284
-347
lines changed

4 files changed

+284
-347
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ dependencies {
6262
api("org.assertj:assertj-core:3.24.2")
6363
api("org.assertj:assertj-assertions-generator:2.2.1")
6464

65+
implementation(gradleKotlinDsl())
6566
implementation("com.google.guava:guava:31.1-jre")
6667

6768
testCompileOnly("org.jetbrains:annotations:24.0.1")

src/main/groovy/org/assertj/generator/gradle/tasks/AssertJGenerationTask.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AssertJGenerationTask extends SourceTask {
4949
final FileCollection templateFiles
5050

5151
@Input
52-
final ListProperty<SerializedTemplate> templates
52+
final ListProperty<SerializedTemplate> generatorTemplates
5353

5454
@OutputDirectory
5555
final DirectoryProperty outputDir
@@ -68,8 +68,10 @@ class AssertJGenerationTask extends SourceTask {
6868
.from(sourceSet.runtimeClasspath)
6969

7070
this.outputDir = assertJOptions.outputDir
71+
// TODO Make `templates.templateFiles` `internal` once `AssertJGenerationTask` is Kotlin
7172
this.templateFiles = assertJOptions.templates.templateFiles
72-
this.templates = assertJOptions.templates.templates
73+
// TODO Make `templates.generatorTemplates` `internal` once `AssertJGenerationTask` is Kotlin
74+
this.generatorTemplates = assertJOptions.templates.generatorTemplates
7375
}
7476

7577
@TaskAction
@@ -141,7 +143,7 @@ class AssertJGenerationTask extends SourceTask {
141143
classes - filteredClasses,
142144
)
143145

144-
def templates = assertJOptions.templates.templates.get().collect { it.maybeLoadTemplate() }.findAll()
146+
def templates = assertJOptions.templates.generatorTemplates.get().collect { it.maybeLoadTemplate() }.findAll()
145147
for (template in templates) {
146148
generator.register(template)
147149
}

src/main/groovy/org/assertj/generator/gradle/tasks/config/Templates.groovy

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

0 commit comments

Comments
 (0)