From 7c7ff289de24df7a0b597ff089a84f76fe1ff941 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Fri, 12 Mar 2021 22:52:59 +0100
Subject: [PATCH] removed module `java.logging` from `module-info.java`s

---
 buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts    |  2 +-
 .../src/main/kotlin/flatlaf-module-info.gradle.kts   | 12 ++++++++++--
 flatlaf-core/src/main/module-info/module-info.java   |  1 -
 .../src/main/module-info/module-info.java            |  1 -
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts b/buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts
index 311d7af4..49c751a1 100644
--- a/buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts
+++ b/buildSrc/src/main/kotlin/flatlaf-java9.gradle.kts
@@ -28,7 +28,7 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 	}
 
 	dependencies {
-		add("java9Compile", sourceSets.main.get().output)
+		add( "java9Compile", sourceSets.main.get().output )
 	}
 
 	tasks {
diff --git a/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts b/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts
index a78879c6..5c464a84 100644
--- a/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts
+++ b/buildSrc/src/main/kotlin/flatlaf-module-info.gradle.kts
@@ -33,9 +33,17 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
 	sourceSets {
 		create( "module-info" ) {
 			java {
-				// include "src/main/java" here to get compile errors if classes are
+				// include "src/main/java" and "src/main/java9" here to get compile errors if classes are
 				// used from other modules that are not specified in module dependencies
-				setSrcDirs( listOf( "src/main/module-info", "src/main/java" ) )
+				setSrcDirs( listOf( "src/main/module-info", "src/main/java", "src/main/java9" ) )
+
+				// exclude Java 8 source file if an equally named Java 9+ source file exists
+				exclude {
+					if( it.isDirectory )
+						return@exclude false
+					val java9file = file( "${projectDir}/src/main/java9/${it.path}" )
+					java9file.exists() && java9file != it.file
+				}
 			}
 		}
 	}
diff --git a/flatlaf-core/src/main/module-info/module-info.java b/flatlaf-core/src/main/module-info/module-info.java
index ee57bed2..55b361f7 100644
--- a/flatlaf-core/src/main/module-info/module-info.java
+++ b/flatlaf-core/src/main/module-info/module-info.java
@@ -19,7 +19,6 @@
  */
 module com.formdev.flatlaf {
 	requires java.desktop;
-	requires static java.logging;
 
 	exports com.formdev.flatlaf;
 	exports com.formdev.flatlaf.icons;
diff --git a/flatlaf-intellij-themes/src/main/module-info/module-info.java b/flatlaf-intellij-themes/src/main/module-info/module-info.java
index c6c87c20..fc6caf64 100644
--- a/flatlaf-intellij-themes/src/main/module-info/module-info.java
+++ b/flatlaf-intellij-themes/src/main/module-info/module-info.java
@@ -19,7 +19,6 @@
  */
 module com.formdev.flatlaf.intellijthemes {
 	requires java.desktop;
-	requires java.logging;
 	requires com.formdev.flatlaf;
 
 	exports com.formdev.flatlaf.intellijthemes;