Add graalvm and application plugin

SimonScholz · Nov 1, 2023 · 7d44d6b · 7d44d6b
1 parent 8047f95
commit 7d44d6b
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 19 deletions.
diff --git a/kotlin-app/build.gradle.kts b/kotlin-app/build.gradle.kts
@@ -2,9 +2,12 @@ import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
     kotlin("jvm")
+    application
 
     id("io.gitlab.arturbosch.detekt")
     id("org.jlleitschuh.gradle.ktlint")
+
+    id("org.graalvm.buildtools.native") version "0.9.28"
 }
 
 repositories {
@@ -17,7 +20,11 @@ dependencies {
     implementation("com.miglayout:miglayout-swing:11.2")
     implementation("org.eclipse.platform:org.eclipse.core.databinding:1.13.100")
     // Just for comparison with JFace implementation
-    //implementation("org.eclipse.platform:org.eclipse.jface.databinding:1.15.100")
+    // implementation("org.eclipse.platform:org.eclipse.jface.databinding:1.15.100")
+}
+
+application {
+    mainClass = "io.github.simonscholz.MainKt"
 }
 
 detekt {

diff --git a/kotlin-app/src/main/kotlin/io/github/simonscholz/Main.kt b/kotlin-app/src/main/kotlin/io/github/simonscholz/Main.kt
@@ -7,13 +7,13 @@ import io.github.simonscholz.qrcode.QrCodeFactory
 import io.github.simonscholz.ui.ImageUI
 import io.github.simonscholz.ui.MainUI
 import io.github.simonscholz.ui.PropertiesUI
+import org.eclipse.core.databinding.DataBindingContext
 import java.awt.Component
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
 import java.awt.image.BufferedImage
 import java.io.File
 import javax.imageio.ImageIO
-import org.eclipse.core.databinding.DataBindingContext
 import javax.swing.JFrame
 import javax.swing.JOptionPane
 import javax.swing.SwingUtilities
@@ -35,7 +35,7 @@ fun main() {
 
         val (imagePanel, setImage) = ImageUI.createImagePanel()
         val (propertiesPanel, applyOnChange) = PropertiesUI.createPropertiesUI(qrCodeConfigViewModel, dataBindingContext) {
-            if(qrCodeConfigViewModel.qrCodeContent.value.isNotBlank()) {
+            if (qrCodeConfigViewModel.qrCodeContent.value.isNotBlank()) {
                 val qrCodeImage = renderImage(qrCodeConfigViewModel, frame)
                 setImage(qrCodeImage)
             }
@@ -49,8 +49,8 @@ fun main() {
 
         dataBindingContext.bindings.forEach {
             it.model.addChangeListener {
-                if(applyOnChange()) {
-                    if(qrCodeConfigViewModel.qrCodeContent.value.isNotBlank()) {
+                if (applyOnChange()) {
+                    if (qrCodeConfigViewModel.qrCodeContent.value.isNotBlank()) {
                         val qrCodeImage = renderImage(qrCodeConfigViewModel, frame)
                         setImage(qrCodeImage)
                     }
@@ -72,7 +72,7 @@ private fun renderImage(qrCodeConfigViewModel: QrCodeConfigViewModel, component:
             relativeSize = qrCodeConfigViewModel.relativeBorderSize.value,
             relativeBorderRound = qrCodeConfigViewModel.borderRadius.value,
         )
-    if(qrCodeConfigViewModel.logo.value.isNotBlank() && File(qrCodeConfigViewModel.logo.value).exists()) {
+    if (qrCodeConfigViewModel.logo.value.isNotBlank() && File(qrCodeConfigViewModel.logo.value).exists()) {
         runCatching {
             ImageIO.read(File(qrCodeConfigViewModel.logo.value)).let {
                 builder.qrLogoConfig(it)

diff --git a/kotlin-app/src/main/kotlin/io/github/simonscholz/extension/BindingExtensions.kt b/kotlin-app/src/main/kotlin/io/github/simonscholz/extension/BindingExtensions.kt
@@ -3,9 +3,9 @@ package io.github.simonscholz.extension
 import io.github.simonscholz.observables.BackgroundColorObservable
 import io.github.simonscholz.observables.DocumentObservable
 import io.github.simonscholz.observables.JSpinnerIntObservable
+import org.eclipse.core.databinding.observable.value.IObservableValue
 import java.awt.Color
 import java.awt.Component
-import org.eclipse.core.databinding.observable.value.IObservableValue
 import javax.swing.JSpinner
 import javax.swing.text.JTextComponent
 

diff --git a/kotlin-app/src/main/kotlin/io/github/simonscholz/observables/BackgroundColorObservable.kt b/kotlin-app/src/main/kotlin/io/github/simonscholz/observables/BackgroundColorObservable.kt
@@ -1,9 +1,9 @@
 package io.github.simonscholz.observables
 
-import java.awt.Color
-import java.awt.Component
 import org.eclipse.core.databinding.observable.Diffs
 import org.eclipse.core.databinding.observable.value.AbstractObservableValue
+import java.awt.Color
+import java.awt.Component
 
 class BackgroundColorObservable(
     private val component: Component,

diff --git a/kotlin-app/src/main/kotlin/io/github/simonscholz/observables/DocumentObservable.kt b/kotlin-app/src/main/kotlin/io/github/simonscholz/observables/DocumentObservable.kt
@@ -1,11 +1,11 @@
 package io.github.simonscholz.observables
 
+import org.eclipse.core.databinding.observable.Diffs
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue
 import javax.swing.event.DocumentEvent
 import javax.swing.event.DocumentListener
 import javax.swing.text.Document
 import javax.swing.text.JTextComponent
-import org.eclipse.core.databinding.observable.Diffs
-import org.eclipse.core.databinding.observable.value.AbstractObservableValue
 
 class DocumentObservable(private val document: Document) : AbstractObservableValue<String>() {
     private var documentValue = document.getText(0, document.length)

diff --git a/...nscholz/observables/JSpinnerObservable.kt → ...holz/observables/JSpinnerIntObservable.kt b/...nscholz/observables/JSpinnerObservable.kt → ...holz/observables/JSpinnerIntObservable.kt
diff --git a/kotlin-app/src/main/kotlin/io/github/simonscholz/observables/SwingRealm.kt b/kotlin-app/src/main/kotlin/io/github/simonscholz/observables/SwingRealm.kt
@@ -1,9 +1,9 @@
 package io.github.simonscholz.observables
 
-import javax.swing.SwingUtilities
 import org.eclipse.core.databinding.observable.Realm
+import javax.swing.SwingUtilities
 
-class SwingRealm: Realm() {
+class SwingRealm : Realm() {
 
     init {
         setDefault(this)

diff --git a/kotlin-app/src/main/kotlin/io/github/simonscholz/ui/PropertiesUI.kt b/kotlin-app/src/main/kotlin/io/github/simonscholz/ui/PropertiesUI.kt
@@ -5,6 +5,9 @@ import io.github.simonscholz.extension.toIntObservable
 import io.github.simonscholz.extension.toObservable
 import io.github.simonscholz.model.QrCodeConfigViewModel
 import io.github.simonscholz.ui.properties.BorderPropertiesUI
+import net.miginfocom.swing.MigLayout
+import org.eclipse.core.databinding.DataBindingContext
+import org.eclipse.core.databinding.observable.value.IObservableValue
 import java.awt.Color
 import java.io.File
 import javax.swing.JButton
@@ -18,10 +21,6 @@ import javax.swing.JTextArea
 import javax.swing.JTextField
 import javax.swing.SpinnerNumberModel
 import javax.swing.filechooser.FileNameExtensionFilter
-import net.miginfocom.swing.MigLayout
-import org.eclipse.core.databinding.DataBindingContext
-import org.eclipse.core.databinding.observable.value.IObservableValue
-
 
 object PropertiesUI {
 
@@ -80,7 +79,7 @@ object PropertiesUI {
         return Pair(propertiesPanel, applyOnChange::isSelected)
     }
 
-    private fun createColorPickerFormItem(propertiesPanel: JPanel, labelText: String, model : IObservableValue<Color>, dataBindingContext: DataBindingContext) {
+    private fun createColorPickerFormItem(propertiesPanel: JPanel, labelText: String, model: IObservableValue<Color>, dataBindingContext: DataBindingContext) {
         propertiesPanel.add(JLabel(labelText))
         val colorPicker = JButton("Choose Color").apply {
             isFocusPainted = false

diff --git a/kotlin-app/src/main/kotlin/io/github/simonscholz/ui/properties/BorderPropertiesUI.kt b/kotlin-app/src/main/kotlin/io/github/simonscholz/ui/properties/BorderPropertiesUI.kt
@@ -4,6 +4,7 @@ import io.github.simonscholz.extension.toBackgroundColorObservable
 import io.github.simonscholz.extension.toObservable
 import io.github.simonscholz.model.QrCodeConfigViewModel
 import net.miginfocom.swing.MigLayout
+import org.eclipse.core.databinding.DataBindingContext
 import java.awt.Color
 import javax.swing.BorderFactory
 import javax.swing.JButton
@@ -12,7 +13,6 @@ import javax.swing.JLabel
 import javax.swing.JPanel
 import javax.swing.JTextField
 import javax.swing.border.TitledBorder
-import org.eclipse.core.databinding.DataBindingContext
 
 object BorderPropertiesUI {
     fun createBorderPropertiesUI(dataBindingContext: DataBindingContext, qrCodeConfigViewModel: QrCodeConfigViewModel): JPanel {