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

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>)

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.

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 );
 

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" )
 

flatlaf-native-jna/src/main/module-info/module-info.java

@@ -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;
-}

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" )
-}

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.*;

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" ) )

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 )
+}