Updated Kotlin & FlatLaf dependency

Ultreon · Mar 27, 2024 · dec4849 · dec4849
1 parent c70214c
commit dec4849
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 
 plugins {
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "1.9.22"
     id("java")
     id("org.panteleyev.jpackageplugin") version "1.5.0"
 }
@@ -30,11 +30,10 @@ configurations {
 }
 
 dependencies {
-//    implementation("com.github.weisj:darklaf-core:3.0.0")
-    implementation("com.formdev:flatlaf:3.0")
-    implementation("com.formdev:flatlaf-intellij-themes:3.0")
-    implementation("com.formdev:flatlaf-extras:3.0")
-    implementation("com.formdev:flatlaf-swingx:3.0")
+    implementation("com.formdev:flatlaf:3.4")
+    implementation("com.formdev:flatlaf-intellij-themes:3.4")
+    implementation("com.formdev:flatlaf-extras:3.4")
+    implementation("com.formdev:flatlaf-swingx:3.4")
     implementation("commons-lang:commons-lang:2.6")
     implementation("org.drjekyll:fontchooser:2.4")
     implementation("com.google.code.gson:gson:2.9.0")

diff --git a/src/main/kotlin/com/ultreon/notepadimproved/main/MainFrame.kt b/src/main/kotlin/com/ultreon/notepadimproved/main/MainFrame.kt
@@ -43,7 +43,7 @@ class MainFrame : JFrame(appName), Translatable {
         val toolkit = Toolkit.getDefaultToolkit()
         val screenSize = toolkit.screenSize
 
-        this.iconImage = appIcon
+        this.iconImages = listOf(appIcon, appIcon16X)
 
         minimumSize = Dimension(800, 450)
 

diff --git a/src/main/kotlin/com/ultreon/notepadimproved/resources.kt b/src/main/kotlin/com/ultreon/notepadimproved/resources.kt
@@ -9,3 +9,5 @@ val appBannerRef: String = Res.require("/images/banner.png")
 val appBanner: Image = Res.loadImage("/images/banner.png")
 val appIconRef: String = Res.require("/icons/app.png")
 val appIcon: Image = Res.loadImage("/icons/app.png")
+val appIcon16XRef: String = Res.require("/icons/app-16x.png")
+val appIcon16X: Image = Res.loadImage("/icons/app-16x.png")
diff --git a/src/main/resources/icons/app-16x.png b/src/main/resources/icons/app-16x.png
diff --git a/src/main/resources/icons/app.png b/src/main/resources/icons/app.png
diff --git a/src/main/resources/images/banner.png b/src/main/resources/images/banner.png