Updated project to multi-module using gradle

.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

.gitignore

@@ -2,3 +2,9 @@
 /dist/
 /build/
 /out/
+
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

build.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project name="legot-neveu-lucas" default="run" basedir=".">
-    <property name="app.name" value="legot-neveu-lucas" />
-    <property name="app.version" value="1.0.0"/>
-    <property name="app.fullname" value="${app.name}-${app.version}"/>
-    <property name="build.home" value="${basedir}/build"/>
-    <property name="build.test.home" value="${basedir}/build/test"/>
-    <property name="javac.version" value="17"/>
-    <property name="dist.home" value="${basedir}/dist"/>
-    <property name="docs.home" value="${basedir}/docs"/>
-    <property name="src.home"  value="${basedir}/src"/>
-    <property name="src.test.home" value="${basedir}/test"/>
-    <property name="test.report.home" value="${basedir}/build/test/results"/>
-    <property name="lib.home" value="${basedir}/lib"/>
-    <property name="javac.encoding"      value="UTF-8"/>
-    <!-- ==================== Compile options =========================== -->
-    <property name="compile.debug"       value="true"/>
-    <property name="compile.deprecation" value="false"/>
-    <property name="compile.optimize"    value="true"/>
-    <!-- ==================== Compilation Classpath =========================== -->
-    <path id="compile.classpath">
-        <fileset dir="${lib.home}">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-    <!-- ==================== All Target ====================================== -->
-    <target name="all" depends="clean,compile" description="Clean build and dist directories, then compile"/>
-    <!-- ==================== Clean Target ==================================== -->
-
-    <target name="clean" description="Delete old build and dist directories">
-        <delete dir="${build.home}"/>
-        <delete dir="${build.test.home}"/>
-        <delete dir="${dist.home}"/>
-        <delete dir="${test.report.home}"/>
-    </target>
-    <!-- ==================== Prepare Target ================================== -->
-    <target name="prepare">
-        <mkdir dir="${build.home}"/>
-        <mkdir dir="${build.test.home}" />
-        <mkdir dir="${dist.home}"/>
-        <mkdir dir="${test.report.home}"/>
-        <mkdir dir="${lib.home}"/>
-        <mkdir dir="${src.test.home}"/>
-    </target>
-    <!-- ==================== Compile Target ================================== -->
-    <target name="compile" depends="prepare" description="Compile Java sources">
-        <javac srcdir="${src.home}"
-               destdir="${build.home}"
-               debug="${compile.debug}"
-               deprecation="${compile.deprecation}"
-               optimize="${compile.optimize}"
-               source="${javac.version}"
-               encoding="${javac.encoding}">
-            <classpath refid="compile.classpath"/>
-        </javac>
-        <javac srcdir="${src.test.home}" destdir="${build.test.home}">
-            <classpath>
-                <pathelement location="${build.home}"/>
-                <path refid="compile.classpath"/>
-            </classpath>
-        </javac>
-        <!-- Copy application resources -->
-        <copy todir="${build.home}">
-            <fileset dir="${src.home}" excludes="**/*.java"/>
-        </copy>
-    </target>
-    <!-- ==================== Dist Target ===================================== -->
-    <target name="dist" depends="clean,compile,javadoc" description="Create binary distribution">
-        <copy  todir="${dist.home}/lib">
-            <fileset dir="${lib.home}"/>
-        </copy>
-        <!-- Create application JAR file -->
-        <jar jarfile="${dist.home}/${app.fullname}.jar"
-             basedir="${build.home}">
-            <manifest>
-                <attribute name="Main-Class" value="fr.unicaen.Main"/>
-                <!-- <attribute name="Class-Path" value="lib/utilsGL.jar" /> -->
-            </manifest>
-        </jar>
-        <!-- Attention : copie ad-hoc pour satisfaire immédiatement une mise à jour de dépendance, car le projet "blackjack" a besoin de cette librairie -->
-        <copy file="${dist.home}/${app.fullname}.jar" todir="${basedir}/../jeuCombat/lib" />
-    </target>
-    <!-- ==================== Javadoc Target ================================== -->
-    <target name="javadoc" depends="compile" description="Create Javadoc API documentation">
-        <mkdir dir="${dist.home}/docs/api"/>
-        <javadoc sourcepath="${src.home}"
-                 destdir="${dist.home}/docs/api"
-                 packagenames="*">
-            <classpath>
-                <fileset dir="${lib.home}">
-                    <include name="**/*.jar"/>
-                </fileset>
-            </classpath>
-        </javadoc>
-    </target>
-    <!-- ==================== Run Target ================================== -->
-    <target name="run" depends="dist">
-        <java jar="${dist.home}/${app.fullname}.jar" fork="true" />
-    </target>
-    <!-- ==================== Test Target ===================================== -->
-    <target name="test" depends="clean,compile,dist">
-        <junit fork="true"  printsummary="withOutAndErr" haltonfailure="false" showoutput="true" logfailedtests="true">
-            <classpath>
-                <pathelement location="${build.test.home}"/>
-                <pathelement location="${build.home}"/>
-                <path refid="compile.classpath"/>
-            </classpath>
-            <formatter type="xml"/>
-            <batchtest   todir="${test.report.home}">
-                <!--
-                    <fileset dir="${build.test.home}">
-                        <include name="**/*Test.class"/>
-                    </fileset>
-                -->
-                <fileset dir="${build.test.home}" includes="**/*Test.class"/>
-            </batchtest>
-        </junit>
-    </target>
-    <target name="junitreport" depends="test">
-        <junitreport todir="${test.report.home}">
-            <fileset dir="${test.report.home}" includes="TEST-*.xml"/>
-            <report todir="${test.report.home}"/>
-        </junitreport>
-    </target>
-</project>

buildSrc/build.gradle

@@ -0,0 +1,13 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build.
+    id 'groovy-gradle-plugin'
+}
+
+repositories {
+    // Use the plugin portal to apply community plugins in convention plugins.
+    gradlePluginPortal()
+}

buildSrc/src/main/groovy/fr.lnl.game.java-application-conventions.gradle

@@ -0,0 +1,11 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    // Apply the common convention plugin for shared build configuration between library and application projects.
+    id 'fr.lnl.game.java-common-conventions'
+
+    // Apply the application plugin to add support for building a CLI application in Java.
+    id 'application'
+}

buildSrc/src/main/groovy/fr.lnl.game.java-common-conventions.gradle

@@ -0,0 +1,31 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    // Apply the java Plugin to add support for Java.
+    id 'java'
+}
+
+repositories {
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+}
+
+dependencies {
+    constraints {
+        // Define dependency versions as constraints
+        implementation 'org.apache.commons:commons-text:1.9'
+    }
+
+    // Use JUnit Jupiter API for testing.
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+
+    // Use JUnit Jupiter Engine for testing.
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+}
+
+tasks.named('test') {
+    // Use junit platform for unit tests.
+    useJUnitPlatform()
+}

buildSrc/src/main/groovy/fr.lnl.game.java-library-conventions.gradle

@@ -0,0 +1,11 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    // Apply the common convention plugin for shared build configuration between library and application projects.
+    id 'fr.lnl.game.java-common-conventions'
+
+    // Apply the java-library plugin for API and implementation separation.
+    id 'java-library'
+}

client/build.gradle

@@ -0,0 +1,22 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    id 'fr.lnl.game.java-application-conventions'
+    id 'org.openjfx.javafxplugin' version '0.0.10'
+}
+
+dependencies {
+    implementation project(':server')
+}
+
+javafx {
+    version = "16"
+    modules = [ 'javafx.controls', 'javafx.graphics' ]
+}
+
+application {
+    // Define the main class for the application.
+    mainClass = 'fr.lnl.game.client.App'
+}

client/src/main/java/fr/lnl/game/client/App.java

@@ -0,0 +1,32 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package fr.lnl.game.client;
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
+import static fr.lnl.game.server.MessageUtils.getMessage;
+
+public class App extends Application {
+
+    public static void main(String[] args) {
+        String result = getMessage();
+        System.out.println(result);
+        launch();
+    }
+
+    @Override
+    public void start(Stage stage) throws Exception {
+        System.out.println("Launching stage");
+        String javaVersion = System.getProperty("java.version");
+        String javafxVersion = System.getProperty("javafx.version");
+        Label l = new Label("Hello, JavaFX version " + javafxVersion + ", running on Java " + javaVersion + ".");
+        Scene scene = new Scene(new StackPane(l), 640, 480);
+        stage.setScene(scene);
+        stage.show();
+    }
+}

client/src/main/java/module-info.java

@@ -0,0 +1,6 @@
+module client {
+    requires javafx.graphics;
+    requires javafx.controls;
+    requires legot.neveu.lucas.server;
+    exports fr.lnl.game.client;
+}

client/src/test/java/fr/lnl/game/client/MessageUtilsTest.java

@@ -0,0 +1,16 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package fr.lnl.game.client;
+
+import fr.lnl.game.server.MessageUtils;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class MessageUtilsTest {
+    @Test
+    public void testGetMessage() {
+        assertEquals("Hello World!", MessageUtils.getMessage());
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

server/build.gradle

@@ -0,0 +1,8 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    id 'fr.lnl.game.java-library-conventions'
+}
+

server/src/main/java/fr/lnl/game/server/MessageUtils.java

@@ -0,0 +1,10 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+package fr.lnl.game.server;
+
+public class MessageUtils {
+    public static String getMessage() {
+        return "Hello World!";
+    }
+}

server/src/main/java/module-info.java

@@ -0,0 +1,3 @@
+module legot.neveu.lucas.server {
+    exports fr.lnl.game.server;
+}

settings.gradle

@@ -0,0 +1,11 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user manual at https://docs.gradle.org/7.0.1/userguide/multi_project_builds.html
+ */
+
+rootProject.name = 'legot-neveu-lucas'
+include('client', 'server')

src/fr/unicaen/Main.java

@@ -1,8 +0,0 @@
-package fr.unicaen;
-
-public class Main {
-
-    public static void main(String[] args) {
-        System.out.println("main");
-    }
-}