From 4c49f939ee05a3946da6671249ad6bb73b18b663 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Wed, 3 Nov 2021 23:17:35 +0100
Subject: [PATCH] Introduce JLink and move classes to correct package

---
 .idea/.name                                           |  2 +-
 .idea/runConfigurations/Run.xml                       |  2 +-
 build.gradle                                          | 11 +++++++++++
 settings.gradle                                       |  2 +-
 .../java/{ => de/icaotix}/ultimatetictactoe/Main.java |  9 +++------
 .../icaotix}/ultimatetictactoe/model/CellState.java   |  2 +-
 .../icaotix}/ultimatetictactoe/model/GameState.java   |  2 +-
 .../de/icaotix/ultimatetictactoe/model/Player.java    |  6 ++++++
 .../ultimatetictactoe/model/TicTacToeGame.java        |  2 +-
 .../ultimatetictactoe/model/UltimateTicTacToe.java    |  2 +-
 .../ultimatetictactoe/view/TicTacToeView.java         |  4 ++--
 .../ultimatetictactoe/view/UltimateTicTacToeView.java |  8 ++++----
 .../viewmodel/TicTacToePanelViewModel.java            |  2 +-
 .../viewmodel/UltimateTicTacToePanelViewModel.java    | 11 ++++++-----
 src/main/java/module-info.java                        |  3 +++
 src/main/java/ultimatetictactoe/model/Player.java     |  6 ------
 16 files changed, 43 insertions(+), 31 deletions(-)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/Main.java (69%)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/model/CellState.java (80%)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/model/GameState.java (83%)
 create mode 100644 src/main/java/de/icaotix/ultimatetictactoe/model/Player.java
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/model/TicTacToeGame.java (98%)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/model/UltimateTicTacToe.java (98%)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/view/TicTacToeView.java (95%)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/view/UltimateTicTacToeView.java (89%)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/viewmodel/TicTacToePanelViewModel.java (97%)
 rename src/main/java/{ => de/icaotix}/ultimatetictactoe/viewmodel/UltimateTicTacToePanelViewModel.java (90%)
 create mode 100644 src/main/java/module-info.java
 delete mode 100644 src/main/java/ultimatetictactoe/model/Player.java

diff --git a/.idea/.name b/.idea/.name
index 10029c6..d42f5ad 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-UltimateTicTacToe
\ No newline at end of file
+ultimate-tictactoe
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run.xml b/.idea/runConfigurations/Run.xml
index 898d511..277a2e3 100644
--- a/.idea/runConfigurations/Run.xml
+++ b/.idea/runConfigurations/Run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="de.icaotix.ultimatetictactoe.Main" />
-    <module name="UltimateTicTacToe.main" />
+    <module name="ultimate-tictactoe.main" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="de.icaotix.ultimatetictactoe.*" />
diff --git a/build.gradle b/build.gradle
index 2577078..a3abed7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'java'
+    id 'org.beryx.jlink' version '2.24.4'
 }
 
 group 'de.icaotix.ultimatetictactoe'
@@ -14,6 +15,16 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
+jlink {
+    options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
+    launcher{
+        name = 'Ultimate TicTacToe'
+        jvmArgs = ['-Dlog4j.configurationFile=./log4j2.xml']
+        noConsole = true
+    }
+    mainClass = "de.icaotix.ultimatetictactoe.Main"
+}
+
 test {
     useJUnitPlatform()
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 8f6e411..0e39df0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'UltimateTicTacToe'
+rootProject.name = 'ultimate-tictactoe'
 
diff --git a/src/main/java/ultimatetictactoe/Main.java b/src/main/java/de/icaotix/ultimatetictactoe/Main.java
similarity index 69%
rename from src/main/java/ultimatetictactoe/Main.java
rename to src/main/java/de/icaotix/ultimatetictactoe/Main.java
index 9e7c0e1..d04fb36 100644
--- a/src/main/java/ultimatetictactoe/Main.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/Main.java
@@ -1,20 +1,17 @@
-package ultimatetictactoe;
+package de.icaotix.ultimatetictactoe;
 
-import ultimatetictactoe.view.UltimateTicTacToeView;
-import ultimatetictactoe.viewmodel.UltimateTicTacToePanelViewModel;
+import de.icaotix.ultimatetictactoe.view.UltimateTicTacToeView;
+import de.icaotix.ultimatetictactoe.viewmodel.UltimateTicTacToePanelViewModel;
 
 import javax.swing.*;
 
 public class Main {
 
     public static void main(String[] args) {
-
-
         SwingUtilities.invokeLater(() -> {
             final UltimateTicTacToePanelViewModel ultimateTicTacToePanelViewModel = new UltimateTicTacToePanelViewModel();
             new UltimateTicTacToeView(ultimateTicTacToePanelViewModel);
             ultimateTicTacToePanelViewModel.prepareNextMove();
         });
-
     }
 }
diff --git a/src/main/java/ultimatetictactoe/model/CellState.java b/src/main/java/de/icaotix/ultimatetictactoe/model/CellState.java
similarity index 80%
rename from src/main/java/ultimatetictactoe/model/CellState.java
rename to src/main/java/de/icaotix/ultimatetictactoe/model/CellState.java
index 80842ad..47d014f 100644
--- a/src/main/java/ultimatetictactoe/model/CellState.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/model/CellState.java
@@ -1,4 +1,4 @@
-package ultimatetictactoe.model;
+package de.icaotix.ultimatetictactoe.model;
 
 public enum CellState {
     X("X"),
diff --git a/src/main/java/ultimatetictactoe/model/GameState.java b/src/main/java/de/icaotix/ultimatetictactoe/model/GameState.java
similarity index 83%
rename from src/main/java/ultimatetictactoe/model/GameState.java
rename to src/main/java/de/icaotix/ultimatetictactoe/model/GameState.java
index 728c0bd..6fc113d 100644
--- a/src/main/java/ultimatetictactoe/model/GameState.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/model/GameState.java
@@ -1,4 +1,4 @@
-package ultimatetictactoe.model;
+package de.icaotix.ultimatetictactoe.model;
 
 public enum GameState {
     X_WON("X won"),
diff --git a/src/main/java/de/icaotix/ultimatetictactoe/model/Player.java b/src/main/java/de/icaotix/ultimatetictactoe/model/Player.java
new file mode 100644
index 0000000..b6065f5
--- /dev/null
+++ b/src/main/java/de/icaotix/ultimatetictactoe/model/Player.java
@@ -0,0 +1,6 @@
+package de.icaotix.ultimatetictactoe.model;
+
+public enum Player {
+    X,
+    O
+}
diff --git a/src/main/java/ultimatetictactoe/model/TicTacToeGame.java b/src/main/java/de/icaotix/ultimatetictactoe/model/TicTacToeGame.java
similarity index 98%
rename from src/main/java/ultimatetictactoe/model/TicTacToeGame.java
rename to src/main/java/de/icaotix/ultimatetictactoe/model/TicTacToeGame.java
index 7321836..c708805 100644
--- a/src/main/java/ultimatetictactoe/model/TicTacToeGame.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/model/TicTacToeGame.java
@@ -1,4 +1,4 @@
-package ultimatetictactoe.model;
+package de.icaotix.ultimatetictactoe.model;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/main/java/ultimatetictactoe/model/UltimateTicTacToe.java b/src/main/java/de/icaotix/ultimatetictactoe/model/UltimateTicTacToe.java
similarity index 98%
rename from src/main/java/ultimatetictactoe/model/UltimateTicTacToe.java
rename to src/main/java/de/icaotix/ultimatetictactoe/model/UltimateTicTacToe.java
index 871e238..0862d6c 100644
--- a/src/main/java/ultimatetictactoe/model/UltimateTicTacToe.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/model/UltimateTicTacToe.java
@@ -1,4 +1,4 @@
-package ultimatetictactoe.model;
+package de.icaotix.ultimatetictactoe.model;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/main/java/ultimatetictactoe/view/TicTacToeView.java b/src/main/java/de/icaotix/ultimatetictactoe/view/TicTacToeView.java
similarity index 95%
rename from src/main/java/ultimatetictactoe/view/TicTacToeView.java
rename to src/main/java/de/icaotix/ultimatetictactoe/view/TicTacToeView.java
index c1ba7e8..3f2579a 100644
--- a/src/main/java/ultimatetictactoe/view/TicTacToeView.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/view/TicTacToeView.java
@@ -1,6 +1,6 @@
-package ultimatetictactoe.view;
+package de.icaotix.ultimatetictactoe.view;
 
-import ultimatetictactoe.viewmodel.TicTacToePanelViewModel;
+import de.icaotix.ultimatetictactoe.viewmodel.TicTacToePanelViewModel;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ultimatetictactoe/view/UltimateTicTacToeView.java b/src/main/java/de/icaotix/ultimatetictactoe/view/UltimateTicTacToeView.java
similarity index 89%
rename from src/main/java/ultimatetictactoe/view/UltimateTicTacToeView.java
rename to src/main/java/de/icaotix/ultimatetictactoe/view/UltimateTicTacToeView.java
index 2a97c24..301684e 100644
--- a/src/main/java/ultimatetictactoe/view/UltimateTicTacToeView.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/view/UltimateTicTacToeView.java
@@ -1,8 +1,8 @@
-package ultimatetictactoe.view;
+package de.icaotix.ultimatetictactoe.view;
 
-import ultimatetictactoe.model.Player;
-import ultimatetictactoe.viewmodel.TicTacToePanelViewModel;
-import ultimatetictactoe.viewmodel.UltimateTicTacToePanelViewModel;
+import de.icaotix.ultimatetictactoe.model.Player;
+import de.icaotix.ultimatetictactoe.viewmodel.TicTacToePanelViewModel;
+import de.icaotix.ultimatetictactoe.viewmodel.UltimateTicTacToePanelViewModel;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ultimatetictactoe/viewmodel/TicTacToePanelViewModel.java b/src/main/java/de/icaotix/ultimatetictactoe/viewmodel/TicTacToePanelViewModel.java
similarity index 97%
rename from src/main/java/ultimatetictactoe/viewmodel/TicTacToePanelViewModel.java
rename to src/main/java/de/icaotix/ultimatetictactoe/viewmodel/TicTacToePanelViewModel.java
index 73d32d8..1c47f4d 100644
--- a/src/main/java/ultimatetictactoe/viewmodel/TicTacToePanelViewModel.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/viewmodel/TicTacToePanelViewModel.java
@@ -1,4 +1,4 @@
-package ultimatetictactoe.viewmodel;
+package de.icaotix.ultimatetictactoe.viewmodel;
 
 import java.util.List;
 import java.util.function.BiConsumer;
diff --git a/src/main/java/ultimatetictactoe/viewmodel/UltimateTicTacToePanelViewModel.java b/src/main/java/de/icaotix/ultimatetictactoe/viewmodel/UltimateTicTacToePanelViewModel.java
similarity index 90%
rename from src/main/java/ultimatetictactoe/viewmodel/UltimateTicTacToePanelViewModel.java
rename to src/main/java/de/icaotix/ultimatetictactoe/viewmodel/UltimateTicTacToePanelViewModel.java
index 3bad9a4..7ce496c 100644
--- a/src/main/java/ultimatetictactoe/viewmodel/UltimateTicTacToePanelViewModel.java
+++ b/src/main/java/de/icaotix/ultimatetictactoe/viewmodel/UltimateTicTacToePanelViewModel.java
@@ -1,9 +1,10 @@
-package ultimatetictactoe.viewmodel;
+package de.icaotix.ultimatetictactoe.viewmodel;
 
-import ultimatetictactoe.model.GameState;
-import ultimatetictactoe.model.Player;
-import ultimatetictactoe.model.TicTacToeGame;
-import ultimatetictactoe.model.UltimateTicTacToe;
+
+import de.icaotix.ultimatetictactoe.model.GameState;
+import de.icaotix.ultimatetictactoe.model.Player;
+import de.icaotix.ultimatetictactoe.model.TicTacToeGame;
+import de.icaotix.ultimatetictactoe.model.UltimateTicTacToe;
 
 import java.util.List;
 import java.util.function.Consumer;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..3c53405
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module ultimate.tictactoe.main {
+    requires java.desktop;
+}
\ No newline at end of file
diff --git a/src/main/java/ultimatetictactoe/model/Player.java b/src/main/java/ultimatetictactoe/model/Player.java
deleted file mode 100644
index 7638819..0000000
--- a/src/main/java/ultimatetictactoe/model/Player.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package ultimatetictactoe.model;
-
-public enum Player {
-    X,
-    O
-}