From f21261914b65c8f3073a22a6c15a3c9e644dd4af Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 9 Apr 2022 18:34:36 +0200 Subject: [PATCH] gradle: build target `flatlaf-natives-windows` only on Windows (to fix build error on macOS) --- flatlaf-core/build.gradle.kts | 3 ++- settings.gradle.kts | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flatlaf-core/build.gradle.kts b/flatlaf-core/build.gradle.kts index f2102c9b..43e9e670 100644 --- a/flatlaf-core/build.gradle.kts +++ b/flatlaf-core/build.gradle.kts @@ -45,7 +45,8 @@ tasks { processResources { // build native libraries - dependsOn( ":flatlaf-natives-windows:assemble" ) + if( org.gradle.internal.os.OperatingSystem.current().isWindows ) + dependsOn( ":flatlaf-natives-windows:assemble" ) } jar { diff --git a/settings.gradle.kts b/settings.gradle.kts index 335c5faa..84f0c699 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,9 +25,10 @@ include( "flatlaf-demo" ) include( "flatlaf-testing" ) include( "flatlaf-theme-editor" ) -includeProject( "flatlaf-natives-windows", "flatlaf-natives/flatlaf-natives-windows" ) -includeProject( "flatlaf-natives-jna", "flatlaf-natives/flatlaf-natives-jna" ) -includeProject( "flatlaf-testing-modular-app", "flatlaf-testing/flatlaf-testing-modular-app" ) +if( org.gradle.internal.os.OperatingSystem.current().isWindows ) + includeProject( "flatlaf-natives-windows", "flatlaf-natives/flatlaf-natives-windows" ) +includeProject( "flatlaf-natives-jna", "flatlaf-natives/flatlaf-natives-jna" ) +includeProject( "flatlaf-testing-modular-app", "flatlaf-testing/flatlaf-testing-modular-app" ) fun includeProject( projectPath: String, projectDir: String ) { include( projectPath )