Skip to content

Commit 8606c30

Browse files
committed
jcp removed extension and added properties into task
1 parent 68378f9 commit 8606c30

4 files changed

Lines changed: 343 additions & 519 deletions

File tree

jcp-tests/jcp-test-gradle/build.gradle

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,41 +33,36 @@ jar {
3333
}
3434
}
3535

36-
preprocessSettings {
37-
def targetFolder = 'build/preprocessed/java'
3836

39-
target = file(targetFolder)
40-
sources = ['src/main/java']
37+
preprocess {
38+
def targetFolder = 'build/preprocessed/java'
4139

42-
allowWhitespaces = true
43-
eol = '\r\n'
44-
keepAttributes=true
45-
sourceEncoding='UTF-8'
46-
targetEncoding='UTF-8'
47-
ignoreMissingSources=false
48-
excludeExtensions=['txt','xml']
49-
extensions=['java']
50-
unknownVarAsFalse=false
51-
dryRun=false
52-
verbose=true
53-
clearTarget=true
54-
careForLastEol=true
55-
keepComments=true
56-
excludeFolders=['**/some1','**/some2']
57-
configFiles=['./configFile.txt']
58-
keepLines=true
59-
allowWhitespaces=true
60-
preserveIndents=true
61-
dontOverwriteSameContent=false
62-
vars = ['some.test.global': 'Some Test Global Value']
40+
target = file(targetFolder)
41+
sources = ['src/main/java']
6342

64-
sourceSets.main.java.srcDirs = [targetFolder]
65-
}
43+
allowWhitespaces = true
44+
eol = '\r\n'
45+
keepAttributes=true
46+
sourceEncoding='UTF-8'
47+
targetEncoding='UTF-8'
48+
ignoreMissingSources=false
49+
excludeExtensions=['txt','xml']
50+
fileExtensions=['java']
51+
unknownVarAsFalse=false
52+
dryRun=false
53+
verbose=true
54+
clearTarget=true
55+
careForLastEol=true
56+
keepComments=true
57+
excludeFolders=['**/some1','**/some2']
58+
configFiles=['./configFile.txt']
59+
keepLines=true
60+
allowWhitespaces=true
61+
preserveIndents=true
62+
dontOverwriteSameContent=false
63+
vars = ['some.test.global': 'Some Test Global Value']
6664

67-
preprocess {
68-
verbose = true
69-
targetEncoding = "UTF-8"
70-
extensions = ["java","kt"]
65+
sourceSets.main.java.srcDirs = [targetFolder]
7166
}
7267

7368
compileJava.dependsOn preprocess

jcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpGradlePlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ public class JcpGradlePlugin implements Plugin<Project> {
99
@Override
1010
public void apply(@Nonnull final Project project) {
1111
project.getTasks().create(JcpPreprocessTask.ID, JcpPreprocessTask.class);
12-
project.getExtensions().create(JcpPreprocessExtension.ID, JcpPreprocessExtension.class);
1312
}
1413
}

jcp/src/main/java/com/igormaznitsa/jcp/gradle/JcpPreprocessExtension.java

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

0 commit comments

Comments
 (0)