Skip to content

Commit 71a1e3c

Browse files
committed
Bugfix
1 parent 0b21d55 commit 71a1e3c

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ java/build/
107107
/java/bin
108108
/java/libraries/svg/bin
109109
/java/preprocessor/build
110+
/java/lsp/build

app/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ sourceSets{
3131
srcDirs("src")
3232
exclude("**/*Kt.java")
3333
}
34-
resources{
35-
srcDirs("src","../build/shared/")
36-
}
3734
}
3835
}
3936

@@ -94,7 +91,6 @@ dependencies {
9491
implementation(libs.compottie)
9592
implementation(libs.kaml)
9693
}
97-
9894
tasks.register<Copy>("copyCore"){
9995
dependsOn(project(":core").tasks.jar)
10096
from(project(":core").layout.buildDirectory.dir("libs"))

app/src/processing/app/Platform.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,10 @@ static public File getContentFile(String name) {
392392
}
393393

394394
static public File getJavaHome() {
395-
var resourcesDir = new File(System.getProperty("compose.application.resources.dir"));
396-
if(resourcesDir.exists()) {
395+
var resourcesDir = System.getProperty("compose.application.resources.dir");
396+
if(resourcesDir != null) {
397397
// find the jdk folder starting with jdk-17
398-
var jdkFolder = Arrays.stream(resourcesDir.listFiles((dir, name) -> dir.isDirectory() && name.startsWith("jdk-17")))
398+
var jdkFolder = Arrays.stream(new File(resourcesDir).listFiles((dir, name) -> dir.isDirectory() && name.startsWith("jdk-17")))
399399
.findFirst()
400400
.orElse(null);
401401
if(Platform.isMacOS()){

0 commit comments

Comments
 (0)