Skip to content

Commit da5092e

Browse files
committed
Add support for .java files & Cleanup
1 parent ab7c216 commit da5092e

File tree

6 files changed

+61
-6
lines changed

6 files changed

+61
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,4 @@ java/gradle/example/gradle/wrapper/gradle-wrapper.jar
127127
java/gradle/example/gradle/wrapper/gradle-wrapper.properties
128128
java/gradle/example/gradlew
129129
java/gradle/example/gradlew.bat
130+
/java/gradle/example/.kotlin/errors

app/src/processing/app/gradle/GradleService.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ class GradleService(val editor: Editor) {
170170
"settings" to Platform.getSettingsFolder().absolutePath.toString(),
171171
"unsaved" to unsaved.joinToString(","),
172172
"debugPort" to debugPort.toString(),
173-
"present" to false, // TODO: Implement
174173
"fullscreen" to false, // TODO: Implement
175174
"display" to 1, // TODO: Implement
176175
"external" to true,
@@ -180,8 +179,6 @@ class GradleService(val editor: Editor) {
180179
//"stop.color" to "0xFF000000", // TODO: Implement
181180
"stop.hide" to false, // TODO: Implement
182181
"sketch.folder" to folder.absolutePath,
183-
//"location" to "0,0",
184-
//"ui.scale" to "1.0",
185182
)
186183
val repository = Platform.getContentFile("repository").absolutePath.replace("""\""", """\\""")
187184

java/gradle/example/.idea/gradle.xml

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

java/gradle/example/.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

java/gradle/src/main/kotlin/ProcessingPlugin.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
5858
// Add the jars in the code folder
5959
project.dependencies.add("implementation", project.fileTree("src").apply { include("**/code/*.jar") })
6060

61-
// TODO: Add support for grabbing Processing internal maven repo even if the user is not using the IDE
6261
// Add the repositories necessary for building the sketch
6362
project.repositories.add(project.repositories.maven { it.setUrl("https://jogamp.org/deployment/maven") })
6463
project.repositories.add(project.repositories.mavenCentral())
@@ -76,7 +75,6 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
7675
}
7776
}
7877

79-
// TODO: Add support for top level .java files
8078
// TODO: Add support for customizing distributables
8179
// TODO: Setup sensible defaults for the distributables
8280

@@ -155,6 +153,16 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
155153

156154
// Set the output of the pre-processor as the input for the java compiler
157155
sourceSet.java.srcDir(task.outputDirectory)
156+
157+
task.doLast {
158+
// Copy java files from the root to the generated directory
159+
project.copy { copyTask ->
160+
copyTask.from(project.layout.projectDirectory){ from ->
161+
from.include("*.java")
162+
}
163+
copyTask.into(task.outputDirectory)
164+
}
165+
}
158166
}
159167

160168
val depsTaskName = sourceSet.getTaskName("addLegacyDependencies", "PDE")

java/src/processing/mode/java/preproc/PdeParseTreeListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ protected void writeMain(PrintWriterWithEditGen footerWriter,
12341234
StringJoiner argsJoiner = new StringJoiner(", ");
12351235

12361236
boolean shouldFullScreen;
1237-
String presentProp = System.getProperty("processing.present");
1237+
String presentProp = System.getProperty("processing.fullscreen");
12381238

12391239
if (presentProp != null) {
12401240
shouldFullScreen = presentProp.equals("true");

0 commit comments

Comments
 (0)