Skip to content

Commit 9670cc8

Browse files
author
ntwigg
committed
Remove the compile-time dependency on the JTE Gradle plugin.
1 parent 317ae61 commit 9670cc8

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ apply from: 干.file('spotless/java.gradle')
1212
apply from: 干.file('base/maven.gradle')
1313
apply from: 干.file('base/sonatype.gradle')
1414

15-
repositories {
16-
mavenCentral()
17-
gradlePluginPortal()
18-
}
1915
dependencies {
2016
// reflection for version decoupling
2117
implementation 'org.jooq:joor:0.9.15'
@@ -28,7 +24,6 @@ dependencies {
2824
api "org.eclipse.jetty:jetty-servlet:$VER_JETTY"
2925
// jte codegen
3026
String VER_JTE = '3.2.1'
31-
api "gg.jte:jte-gradle-plugin:${VER_JTE}"
3227
implementation "gg.jte:jte-runtime:${VER_JTE}"
3328
implementation "gg.jte:jte:${VER_JTE}"
3429
}

src/main/java/com/diffplug/webtools/jte/JtePlugin.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package com.diffplug.webtools.jte;
1717

18+
import static org.joor.Reflect.on;
1819
import static org.joor.Reflect.onClass;
1920

2021
import gg.jte.ContentType;
@@ -51,21 +52,22 @@ public class JtePlugin implements Plugin<Project> {
5152
public void apply(Project project) {
5253
project.getPlugins().apply("gg.jte.gradle");
5354
project.getPlugins().apply("org.jetbrains.kotlin.jvm");
54-
gg.jte.gradle.JteExtension extension = (gg.jte.gradle.JteExtension) project.getExtensions().getByType(onClass("gg.jte.gradle.JteExtension").type());
55+
var extension = on(project.getExtensions().getByType(onClass("gg.jte.gradle.JteExtension").type()));
5556

5657
JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
5758
SourceSet main = javaPluginExtension.getSourceSets().findByName("main");
5859

5960
project.getTasks().named("classes").configure(task -> {
60-
task.getInputs().dir(extension.getSourceDirectory());
61+
task.getInputs().dir(extension.call("getSourceDirectory"));
6162
});
63+
6264
var jteModelsTask = project.getTasks().register("jteModels", RenderModelClasses.class, task -> {
6365
var jteModels = new File(project.getLayout().getBuildDirectory().getAsFile().get(), "jte-models");
6466
main.getJava().srcDir(jteModels);
6567
task.getOutputDir().set(jteModels);
66-
task.getInputDir().set(extension.getSourceDirectory().get().toFile());
67-
task.getPackageName().set(extension.getPackageName());
68-
task.getContentType().set(extension.getContentType());
68+
task.getInputDir().set((File) extension.call("getSourceDirectory").call("get").call("toFile").get());
69+
task.getPackageName().set((Property<String>) extension.call("getPackageName").get());
70+
task.getContentType().set((Property<ContentType>) extension.call("getContentType").get());
6971
});
7072
project.getTasks().named("compileKotlin").configure(task -> task.dependsOn(jteModelsTask));
7173
}

0 commit comments

Comments
 (0)