Require Java 17

Keeping support for Java 8 only results in headaches.
1 year ago · 8638d9d0bd
18 changed files with 21 additions and 109 deletions
--- a/annotations-processor/build.gradle.kts
+++ b/annotations-processor/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }

 dependencies {
--- a/annotations/build.gradle.kts
+++ b/annotations/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }

 dependencies {
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -172,8 +172,8 @@ allprojects {

    plugins.withType<JavaPlugin> {
        configure<JavaPluginExtension> {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
            withSourcesJar()
            if (!skipJavadoc && isRelease) {
                withJavadocJar()
@ -271,14 +271,6 @@ allprojects {

            withType<Javadoc>().configureEach {
                (options as StandardJavadocDocletOptions).apply {
-                    // -add-exports requires target 9
-                    // The library is built with target=1.8, so add-exports
-                    if (project.the<JavaPluginExtension>().targetCompatibility.isJava9Compatible) {
-                        addStringOption("-add-exports", "java.desktop/sun.swing=ALL-UNNAMED")
-                        addStringOption("-add-exports", "java.desktop/sun.awt=ALL-UNNAMED")
-                        addStringOption("-add-exports", "java.desktop/com.sun.java.swing=ALL-UNNAMED")
-                        addStringOption("-add-exports", "java.desktop/sun.awt.shell=ALL-UNNAMED")
-                    }
                    quiet()
                    locale = "en"
                    docEncoding = "UTF-8"
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@ -28,9 +28,5 @@ gradlePlugin {
            id = "apple-m1-toolchain"
            implementationClass = "AppleM1ToolChainRule"
        }
-        create("module-info-compile") {
-            id = "module-info-compile"
-            implementationClass = "ModuleInfoCompilePlugin"
-        }
    }
 }
--- a/compatibility/build.gradle.kts
+++ b/compatibility/build.gradle.kts
@ -3,19 +3,9 @@ import com.github.vlsi.gradle.crlf.LineEndings

 plugins {
    `java-library`
-    `module-info-compile`
    id("com.github.vlsi.crlf")
 }

-configure<ModuleInfoExtension> {
-    version = JavaVersion.VERSION_11
-    extraArgs = listOf(
-        "--add-exports",
-        "java.desktop/sun.awt=darklaf.compatibility"
-    )
-    stubModule("darklaf.core")
-}
-
 dependencies {
    implementation(projects.darklafUtils)
    implementation(projects.darklafPlatformBase)
--- a/compatibility/src/main/java/com/github/weisj/darklaf/compatibility/SwingUtil.java
+++ b/compatibility/src/main/java/com/github/weisj/darklaf/compatibility/SwingUtil.java
@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2019-2022 Jannis Weis
+ * Copyright (c) 2019-2023 Jannis Weis
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 * associated documentation files (the "Software"), to deal in the Software without restriction,
@ -31,9 +31,6 @@ import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.util.logging.Logger;

 import javax.swing.JComponent;
@ -48,9 +45,9 @@ import javax.swing.plaf.synth.SynthContext;
 import javax.swing.plaf.synth.SynthGraphicsUtils;
 import javax.swing.plaf.synth.SynthStyle;

+import jdk.swing.interop.SwingInterOpUtils;
+
 import com.github.weisj.darklaf.platform.SystemInfo;
-import com.github.weisj.darklaf.util.Lambdas;
-import com.github.weisj.darklaf.util.LazyValue;
 import com.github.weisj.darklaf.util.LogUtil;
 import com.intellij.util.ui.UIUtilities;

@ -62,31 +59,12 @@ public final class SwingUtil {

    private SwingUtil() {}

-    private static boolean swingInteropAvailable;
-    private static Class<?> swingInteropClass;
-    private static final LazyValue<MethodHandle> grabMethod = new LazyValue<>(
-            Lambdas.orDefault(() -> MethodHandles.lookup().findStatic(swingInteropClass, "grab",
-                    MethodType.methodType(void.class, Toolkit.class, Window.class)), null));
-    private static final LazyValue<MethodHandle> ungrabMethod = new LazyValue<>(
-            Lambdas.orDefault(() -> MethodHandles.lookup().findStatic(swingInteropClass, "ungrab",
-                    MethodType.methodType(void.class, Toolkit.class, Window.class)), null));
-
-    static {
-        try {
-            swingInteropClass = Class.forName("jdk.swing.interop.SwingInterOpUtils");
-            swingInteropAvailable = true;
-        } catch (Throwable e) {
-            swingInteropAvailable = false;
-        }
-        LOGGER.fine("SwingInterOpUtils available: " + swingInteropAvailable);
-    }
-
    public static boolean isSunToolkit(final Toolkit toolkit) {
        return toolkit != null && isInstanceOf(toolkit.getClass(), "sun.awt.SunToolkit");
    }

    public static boolean isUngrabEvent(final AWTEvent event) {
-        return event != null && isInstanceOf(event.getClass(), "sun.awt.UngrabEvent");
+        return SwingInterOpUtils.isUngrabEvent(event);
    }

    private static boolean isInstanceOf(final Class<?> cls, final String type) {
@ -99,31 +77,11 @@ public final class SwingUtil {
    }

    public static void grab(final Toolkit toolkit, final Window window) {
-        if (swingInteropAvailable) {
-            try {
-                grabMethod.get().invokeExact(toolkit, window);
-            } catch (Throwable e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            if (toolkit instanceof sun.awt.SunToolkit) {
-                ((sun.awt.SunToolkit) toolkit).grab(window);
-            }
-        }
+        SwingInterOpUtils.grab(toolkit, window);
    }

    public static void ungrab(final Toolkit toolkit, final Window window) {
-        if (swingInteropAvailable) {
-            try {
-                ungrabMethod.get().invokeExact(toolkit, window);
-            } catch (Throwable e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            if (toolkit instanceof sun.awt.SunToolkit) {
-                ((sun.awt.SunToolkit) toolkit).ungrab(window);
-            }
-        }
+        SwingInterOpUtils.ungrab(toolkit, window);
    }

    public static void drawStringUnderlineCharAt(final JComponent c, final Graphics g,
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@ -4,7 +4,6 @@ import com.github.vlsi.gradle.properties.dsl.props

 plugins {
    `java-library`
-    `module-info-compile`
    id("com.github.vlsi.crlf")
 }

@ -41,12 +40,12 @@ dependencies {
    testCompileOnly(libs.nullabilityAnnotations)
 }

-moduleInfo {
-    modularExec {
-        addExports.add("java.desktop/com.sun.java.swing=darklaf.core")
-        openTestPackagesTo("darklaf.properties")
-    }
-}
+// moduleInfo {
+//    modularExec {
+//        addExports.add("java.desktop/com.sun.java.swing=darklaf.core")
+//        openTestPackagesTo("darklaf.properties")
+//    }
+// }

 tasks.test {
    doFirst {
--- a/iconset/build.gradle.kts
+++ b/iconset/build.gradle.kts
@ -3,7 +3,6 @@ import com.github.vlsi.gradle.crlf.LineEndings

 plugins {
    `java-library`
-    `module-info-compile`
    id("com.github.vlsi.crlf")
 }

--- a/macos/build.gradle.kts
+++ b/macos/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    java
-    `module-info-compile`
    id("dev.nokee.jni-library")
    id("dev.nokee.objective-cpp-language")
    `uber-jni-jar`
@ -8,12 +7,6 @@ plugins {
    `apple-m1-toolchain`
 }

-moduleInfo {
-    stubModule("darklaf.core")
-    stubModule("darklaf.platform.preferences")
-    stubModule("darklaf.platform.decorations")
-}
-
 val nativeResourcePath = "com/github/weisj/darklaf/platform/${project.name}"

 library {
@ -22,8 +15,8 @@ library {
        jvmImplementation(projects.darklafUtils)
        jvmImplementation(projects.darklafNativeUtils)
        jvmImplementation(projects.darklafPlatformBase)
-        nativeLibImplementation(macOsFrameworks.appKit)
-        nativeLibImplementation(macOsFrameworks.cocoa)
+//        nativeLibImplementation(macOsFrameworks.appKit)
+//        nativeLibImplementation(macOsFrameworks.cocoa)
    }

    targetMachines.addAll(machines.macOS.x86_64, machines.macOS.architecture("arm64"))
@ -40,9 +33,11 @@ library {
            linkTask.configure {
                linkerArgs.addAll(
                    "-lobjc",
-                    "-mmacosx-version-min=$minOs"
-                    // "-framework", "AppKit",
-                    // "-framework", "Cocoa",
+                    "-mmacosx-version-min=$minOs",
+                    "-framework",
+                    "AppKit",
+                    "-framework",
+                    "Cocoa"
                )
            }
        }
--- a/native-utils/build.gradle.kts
+++ b/native-utils/build.gradle.kts
@ -3,7 +3,6 @@ import com.github.vlsi.gradle.crlf.LineEndings

 plugins {
    `java-library`
-    `module-info-compile`
 }

 tasks.jar {
--- a/platform-base/build.gradle.kts
+++ b/platform-base/build.gradle.kts
@ -1,4 +1,3 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }
--- a/platform-decorations/build.gradle.kts
+++ b/platform-decorations/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }

 dependencies {
--- a/platform-preferences/build.gradle.kts
+++ b/platform-preferences/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }

 dependencies {
--- a/property-loader/build.gradle.kts
+++ b/property-loader/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }

 dependencies {
--- a/theme-spec/build.gradle.kts
+++ b/theme-spec/build.gradle.kts
@ -1,4 +1,3 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }
--- a/theme/build.gradle.kts
+++ b/theme/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }

 dependencies {
--- a/utils/build.gradle.kts
+++ b/utils/build.gradle.kts
@ -1,6 +1,5 @@
 plugins {
    `java-library`
-    `module-info-compile`
 }

 dependencies {
--- a/windows/build.gradle.kts
+++ b/windows/build.gradle.kts
@ -1,18 +1,11 @@
 plugins {
    java
-    `module-info-compile`
    id("dev.nokee.jni-library")
    id("dev.nokee.cpp-language")
    `uber-jni-jar`
    `use-prebuilt-binaries`
 }

-moduleInfo {
-    stubModule("darklaf.core")
-    stubModule("darklaf.platform.preferences")
-    stubModule("darklaf.platform.decorations")
-}
-
 library {
    dependencies {
        jvmImplementation(projects.darklafNativeUtils)