From a6815574f778ece21ccb5d8aef59c37e6ffcce70 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Thu, 4 Mar 2021 11:04:47 +0100
Subject: [PATCH] Native window decorations: renamed project
 `flatlaf-native-jna` to `flatlaf-natives/flatlaf-natives-jna`

removed module-info.java because this JAR is not released/published
---
 .../java/com/formdev/flatlaf/FlatLaf.java     |  2 +-
 .../formdev/flatlaf/FlatSystemProperties.java |  2 +-
 .../flatlaf/ui/FlatNativeWindowBorder.java    |  2 +-
 flatlaf-demo/build.gradle.kts                 |  4 +--
 .../src/main/module-info/module-info.java     | 27 -------------------
 .../flatlaf-natives-jna}/build.gradle.kts     |  5 ----
 .../FlatWindowsNativeWindowBorder.java        |  2 +-
 flatlaf-testing/build.gradle.kts              |  2 +-
 settings.gradle.kts                           |  8 +++++-
 9 files changed, 14 insertions(+), 40 deletions(-)
 delete mode 100644 flatlaf-native-jna/src/main/module-info/module-info.java
 rename {flatlaf-native-jna => flatlaf-natives/flatlaf-natives-jna}/build.gradle.kts (90%)
 rename {flatlaf-native-jna/src/main/java/com/formdev/flatlaf/nativejna => flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna}/windows/FlatWindowsNativeWindowBorder.java (99%)

diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
index e6c89414..a8914ea9 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -165,7 +165,7 @@ public abstract class FlatLaf
 	 * <p>
 	 * Returns also {@code false} on Windows 10 if:
 	 * <ul>
-	 * <li>FlatLaf native window border support is available (requires {@code flatlaf-native-jna.jar})</li>
+	 * <li>FlatLaf native window border support is available (requires {@code flatlaf-natives-jna.jar})</li>
 	 * <li>running in
 	 * <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime 11 (or later)</a>
 	 * (<a href="https://github.com/JetBrains/JetBrainsRuntime">source code on github</a>)
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
index 5c7fe50f..45a24b2d 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatSystemProperties.java
@@ -74,7 +74,7 @@ public interface FlatSystemProperties
 	/**
 	 * Specifies whether FlatLaf native window decorations should be used
 	 * when creating {@code JFrame} or {@code JDialog}.
-	 * Requires that {@code flatlaf-native-jna.jar} is on classpath/modulepath.
+	 * Requires that {@code flatlaf-natives-jna.jar} is on classpath/modulepath.
 	 * <p>
 	 * Setting this to {@code true} forces using FlatLaf native window decorations
 	 * even if they are not enabled by the application.
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
index 319f6706..63e62ee1 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
@@ -228,7 +228,7 @@ public class FlatNativeWindowBorder
 			return;
 
 		try {
-			Class<?> cls = Class.forName( "com.formdev.flatlaf.nativejna.windows.FlatWindowsNativeWindowBorder" );
+			Class<?> cls = Class.forName( "com.formdev.flatlaf.natives.jna.windows.FlatWindowsNativeWindowBorder" );
 			Method m = cls.getMethod( "getInstance" );
 			nativeProvider = (Provider) m.invoke( null );
 
diff --git a/flatlaf-demo/build.gradle.kts b/flatlaf-demo/build.gradle.kts
index e39dc89d..2d3d4f2f 100644
--- a/flatlaf-demo/build.gradle.kts
+++ b/flatlaf-demo/build.gradle.kts
@@ -27,7 +27,7 @@ repositories {
 
 dependencies {
 	implementation( project( ":flatlaf-core" ) )
-	implementation( project( ":flatlaf-native-jna" ) )
+	implementation( project( ":flatlaf-natives-jna" ) )
 	implementation( project( ":flatlaf-extras" ) )
 	implementation( project( ":flatlaf-intellij-themes" ) )
 	implementation( "com.miglayout:miglayout-swing:5.3-SNAPSHOT" )
@@ -37,7 +37,7 @@ dependencies {
 tasks {
 	jar {
 		dependsOn( ":flatlaf-core:jar" )
-		dependsOn( ":flatlaf-native-jna:jar" )
+		dependsOn( ":flatlaf-natives-jna:jar" )
 		dependsOn( ":flatlaf-extras:jar" )
 		dependsOn( ":flatlaf-intellij-themes:jar" )
 
diff --git a/flatlaf-native-jna/src/main/module-info/module-info.java b/flatlaf-native-jna/src/main/module-info/module-info.java
deleted file mode 100644
index 68f3431c..00000000
--- a/flatlaf-native-jna/src/main/module-info/module-info.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2021 FormDev Software GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Karl Tauber
- */
-module com.formdev.flatlaf.nativejna {
-	requires java.desktop;
-	requires com.sun.jna;
-	requires com.sun.jna.platform;
-	requires com.formdev.flatlaf;
-
-	exports com.formdev.flatlaf.nativejna.windows;
-}
diff --git a/flatlaf-native-jna/build.gradle.kts b/flatlaf-natives/flatlaf-natives-jna/build.gradle.kts
similarity index 90%
rename from flatlaf-native-jna/build.gradle.kts
rename to flatlaf-natives/flatlaf-natives-jna/build.gradle.kts
index a085df22..92ebbe86 100644
--- a/flatlaf-native-jna/build.gradle.kts
+++ b/flatlaf-natives/flatlaf-natives-jna/build.gradle.kts
@@ -16,7 +16,6 @@
 
 plugins {
 	`java-library`
-	`flatlaf-module-info`
 }
 
 dependencies {
@@ -24,7 +23,3 @@ dependencies {
 	implementation( "net.java.dev.jna:jna:5.7.0" )
 	implementation( "net.java.dev.jna:jna-platform:5.7.0" )
 }
-
-flatlafModuleInfo {
-	dependsOn( ":flatlaf-core:jar" )
-}
diff --git a/flatlaf-native-jna/src/main/java/com/formdev/flatlaf/nativejna/windows/FlatWindowsNativeWindowBorder.java b/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java
similarity index 99%
rename from flatlaf-native-jna/src/main/java/com/formdev/flatlaf/nativejna/windows/FlatWindowsNativeWindowBorder.java
rename to flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java
index 9e4439d5..07d09bff 100644
--- a/flatlaf-native-jna/src/main/java/com/formdev/flatlaf/nativejna/windows/FlatWindowsNativeWindowBorder.java
+++ b/flatlaf-natives/flatlaf-natives-jna/src/main/java/com/formdev/flatlaf/natives/jna/windows/FlatWindowsNativeWindowBorder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.formdev.flatlaf.nativejna.windows;
+package com.formdev.flatlaf.natives.jna.windows;
 
 import static com.sun.jna.platform.win32.ShellAPI.*;
 import static com.sun.jna.platform.win32.WinReg.*;
diff --git a/flatlaf-testing/build.gradle.kts b/flatlaf-testing/build.gradle.kts
index bc4acaf3..4cf8b850 100644
--- a/flatlaf-testing/build.gradle.kts
+++ b/flatlaf-testing/build.gradle.kts
@@ -27,7 +27,7 @@ repositories {
 
 dependencies {
 	implementation( project( ":flatlaf-core" ) )
-	implementation( project( ":flatlaf-native-jna" ) )
+	implementation( project( ":flatlaf-natives-jna" ) )
 	implementation( project( ":flatlaf-extras" ) )
 	implementation( project( ":flatlaf-swingx" ) )
 	implementation( project( ":flatlaf-jide-oss" ) )
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a69da8d5..260ca231 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,7 +17,6 @@
 rootProject.name = "FlatLaf"
 
 include( "flatlaf-core" )
-include( "flatlaf-native-jna" )
 include( "flatlaf-extras" )
 include( "flatlaf-swingx" )
 include( "flatlaf-jide-oss" )
@@ -25,3 +24,10 @@ include( "flatlaf-intellij-themes" )
 include( "flatlaf-demo" )
 include( "flatlaf-testing" )
 include( "flatlaf-theme-editor" )
+
+includeProject( "flatlaf-natives-jna",     "flatlaf-natives/flatlaf-natives-jna" )
+
+fun includeProject( projectPath: String, projectDir: String ) {
+	include( projectPath )
+	project( ":$projectPath" ).projectDir = file( projectDir )
+}