Skip to content

Commit 3b48491

Browse files
sdelamoetiennestuder
authored andcommitted
add discardLogicWhitespace
1 parent c4e49b3 commit 3b48491

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/main/java/nu/studer/gradle/rocker/RockerCompile.java

+8
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class RockerCompile extends DefaultTask {
4343
private static final String ROCKER_FILE_EXTENSION_PREFIX = ".rocker";
4444

4545
private final Provider<Boolean> optimize;
46+
private final Provider<Boolean> discardLogicWhitespace;
4647
private final Provider<String> extendsClass;
4748
private final Provider<String> extendsModelClass;
4849
private final Provider<String> javaVersion;
@@ -61,6 +62,7 @@ public class RockerCompile extends DefaultTask {
6162
@Inject
6263
public RockerCompile(RockerConfig config, FileCollection runtimeClasspath, ObjectFactory objects, ProjectLayout projectLayout, FileSystemOperations fileSystemOperations, ExecOperations execOperations) {
6364
this.optimize = objects.property(Boolean.class).value(config.getOptimize());
65+
this.discardLogicWhitespace = objects.property(Boolean.class).value(config.getDiscardLogicWhitespace());
6466
this.extendsClass = objects.property(String.class).value(config.getExtendsClass());
6567
this.extendsModelClass = objects.property(String.class).value(config.getExtendsModelClass());
6668
this.javaVersion = objects.property(String.class).value(config.getJavaVersion());
@@ -88,6 +90,11 @@ public Provider<Boolean> getOptimize() {
8890
return optimize;
8991
}
9092

93+
@Input
94+
public Provider<Boolean> getDiscardLogicWhitespace() {
95+
return discardLogicWhitespace;
96+
}
97+
9198
@Optional
9299
@Input
93100
public Provider<String> getExtendsClass() {
@@ -235,6 +242,7 @@ public void execute(JavaExecSpec spec) {
235242
spec.setClasspath(runtimeClasspath);
236243
spec.setWorkingDir(projectLayout.getProjectDirectory());
237244
spec.systemProperty("rocker.option.optimize", optimize.get().toString());
245+
spec.systemProperty("rocker.option.discardLogicWhitespace", discardLogicWhitespace.get().toString());
238246
systemPropertyIfNotNull("rocker.option.extendsClass", extendsClass.getOrNull(), spec);
239247
systemPropertyIfNotNull("rocker.option.extendsModelClass", extendsModelClass.getOrNull(), spec);
240248
systemPropertyIfNotNull("rocker.option.javaVersion", javaVersion.getOrNull(), spec);

src/main/java/nu/studer/gradle/rocker/RockerConfig.java

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class RockerConfig {
1212
final String name;
1313

1414
private final Property<Boolean> optimize;
15+
private final Property<Boolean> discardLogicWhitespace;
1516
private final Property<String> extendsClass;
1617
private final Property<String> extendsModelClass;
1718
private final Property<String> javaVersion;
@@ -26,6 +27,7 @@ public RockerConfig(String name, ObjectFactory objects, ProjectLayout layout) {
2627
this.name = name;
2728

2829
this.optimize = objects.property(Boolean.class).convention(Boolean.FALSE);
30+
this.discardLogicWhitespace = objects.property(Boolean.class).convention(Boolean.FALSE);
2931
this.extendsClass = objects.property(String.class).convention((String) null);
3032
this.extendsModelClass = objects.property(String.class).convention((String) null);
3133
this.javaVersion = objects.property(String.class).convention(Runtime.class.getPackage().getSpecificationVersion());
@@ -40,6 +42,10 @@ public Property<Boolean> getOptimize() {
4042
return optimize;
4143
}
4244

45+
public Property<Boolean> getDiscardLogicWhitespace() {
46+
return discardLogicWhitespace;
47+
}
48+
4349
public Property<String> getExtendsClass() {
4450
return extendsClass;
4551
}

0 commit comments

Comments
 (0)