diff --git a/.gitignore b/.gitignore index 2ab5edd..20409e3 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,3 @@ NumberGuessingGame-linux/ NumberGuessingGame-windows.zip NumberGuessingGame-macos.zip NumberGuessingGame-linux.tar.gz - -# TeaVM generated JavaScript (build artifact) -teavm/classes.js diff --git a/app/build.gradle b/app/build.gradle index 24cae97..bbe7ebc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,6 +4,8 @@ plugins { //Spotless id 'com.diffplug.spotless' version '8.0.0' + + id 'com.gradleup.shadow' version '9.2.2' } repositories { @@ -14,6 +16,8 @@ repositories { dependencies { // This dependency is used by the application. implementation libs.guava + + implementation files('../libs/jlibutils-0.0.1.jar') } testing { @@ -30,14 +34,10 @@ testing { java { toolchain { // Use JDK 25 - languageVersion = JavaLanguageVersion.of(25) + languageVersion = JavaLanguageVersion.of(8) } } -tasks.withType(JavaCompile) { - options.release.set(8) -} - application { // Define the main class for the application. mainClass = 'io.github.project516.NumberGuessingGame.Main' diff --git a/libs/jlibutils-0.0.1.jar b/libs/jlibutils-0.0.1.jar new file mode 100644 index 0000000..8e07129 Binary files /dev/null and b/libs/jlibutils-0.0.1.jar differ diff --git a/package-deb.sh b/package-deb.sh index 3c1ff9c..e0a1968 100755 --- a/package-deb.sh +++ b/package-deb.sh @@ -21,7 +21,7 @@ gradle build # Copy the compiled JAR file to the package directory echo "Copying files to package directory..." -cp app/build/libs/app.jar debian-package/usr/share/games/numberguessinggame/game.jar +cp app/build/libs/app-all.jar debian-package/usr/share/games/numberguessinggame/game.jar # Copy documentation files cp README.md debian-package/usr/share/games/numberguessinggame/README.md diff --git a/package-linux.sh b/package-linux.sh index 399dd91..26d452a 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -37,7 +37,7 @@ cd .. # Create package directory structure echo "Creating package structure..." mkdir -p ${PACKAGE_NAME} -cp app/build/libs/app.jar ${PACKAGE_NAME}/game.jar +cp app/build/libs/app-all.jar ${PACKAGE_NAME}/game.jar cp README.md ${PACKAGE_NAME}/README.txt cp LICENSE ${PACKAGE_NAME}/LICENSE diff --git a/package-macos.sh b/package-macos.sh index e3df675..b87bc2e 100755 --- a/package-macos.sh +++ b/package-macos.sh @@ -37,7 +37,7 @@ cd .. # Create package directory structure echo "Creating package structure..." mkdir -p ${PACKAGE_NAME} -cp app/build/libs/app.jar ${PACKAGE_NAME}/game.jar +cp app/build/libs/app-all.jar ${PACKAGE_NAME}/game.jar cp README.md ${PACKAGE_NAME}/README.txt cp LICENSE ${PACKAGE_NAME}/LICENSE diff --git a/package-win.sh b/package-win.sh index e94b40e..5f9d671 100755 --- a/package-win.sh +++ b/package-win.sh @@ -37,7 +37,7 @@ cd .. # Create package directory structure echo "Creating package structure..." mkdir -p ${PACKAGE_NAME} -cp app/build/libs/app.jar ${PACKAGE_NAME}/game.jar +cp app/build/libs/app-all.jar ${PACKAGE_NAME}/game.jar cp README.md ${PACKAGE_NAME}/README.txt cp LICENSE ${PACKAGE_NAME}/LICENSE diff --git a/package-zip.bat b/package-zip.bat index f65a778..bdc0e6a 100644 --- a/package-zip.bat +++ b/package-zip.bat @@ -11,7 +11,7 @@ REM Create distribution directory structure mkdir NumberGuessingGame REM Copy the game JAR and necessary files -copy app\build\libs\app.jar NumberGuessingGame\game.jar +copy app\build\libs\app-all.jar NumberGuessingGame\game.jar copy scripts\run.bat NumberGuessingGame\run.bat copy scripts\run.sh NumberGuessingGame\run.sh copy README.md NumberGuessingGame\README.txt diff --git a/package-zip.sh b/package-zip.sh index 8b6485d..712ed00 100755 --- a/package-zip.sh +++ b/package-zip.sh @@ -16,7 +16,7 @@ cd .. mkdir NumberGuessingGame # Copy the game JAR and necessary files -cp -r app/build/libs/app.jar NumberGuessingGame/game.jar +cp -r app/build/libs/app-all.jar NumberGuessingGame/game.jar cp -r scripts/run.bat NumberGuessingGame/run.bat cp -r scripts/run.sh NumberGuessingGame/run.sh cp -r README.md NumberGuessingGame/README.txt diff --git a/teavm.sh b/teavm.sh deleted file mode 100755 index 7aea388..0000000 --- a/teavm.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Script to build TeaVM JavaScript output for GitHub Pages deployment -# TeaVM compiles Java bytecode to JavaScript for running in web browsers -# This script replaces the old cheerpj.sh approach -# Output: JavaScript files in app/build/docs/javadoc/teavm/ - -echo "Building project..." -./gradlew build - -echo "Compiling Java to JavaScript with TeaVM..." -# Note: Configuration cache is disabled due to TeaVM plugin compatibility -./gradlew teavmc --no-configuration-cache - -echo "Copying TeaVM output to javadoc directory..." -# Create output directory if it doesn't exist -mkdir -p app/build/docs/javadoc/teavm - -# Copy generated JavaScript and HTML files -cp -f app/build/teavm/classes.js app/build/docs/javadoc/teavm/ -cp -f teavm/index.html app/build/docs/javadoc/teavm/ - -echo "TeaVM build completed successfully!" -echo "Output location: app/build/docs/javadoc/teavm/" diff --git a/test-gui.bat b/test-gui.bat index 01a3e20..274ef1a 100644 --- a/test-gui.bat +++ b/test-gui.bat @@ -4,6 +4,6 @@ REM This script runs the graphical version of the game REM Note: Run gradlew.bat build first to compile the project REM Run the game in GUI mode (default - opens a window) -java -jar app/build/libs/app.jar +java -jar app/build/libs/app-all.jar @pause diff --git a/test-gui.sh b/test-gui.sh index a163e66..50d26ae 100644 --- a/test-gui.sh +++ b/test-gui.sh @@ -6,4 +6,4 @@ ./gradlew build # Run the game in GUI mode (default - opens a window) -java -jar app/build/libs/app.jar +java -jar app/build/libs/app-all.jar diff --git a/test.bat b/test.bat index bb0aa1d..0015063 100644 --- a/test.bat +++ b/test.bat @@ -4,6 +4,6 @@ REM This script runs the console version of the game REM Note: Run gradlew.bat build first to compile the project REM Run the game in console mode (text-based interface) -java -jar app/build/libs/app.jar --console +java -jar app/build/libs/app-all.jar --console @pause diff --git a/test.sh b/test.sh index 67503c4..38f354c 100755 --- a/test.sh +++ b/test.sh @@ -6,4 +6,4 @@ ./gradlew build # Run the game in console mode (text-based interface) -java -jar app/build/libs/app.jar --console +java -jar app/build/libs/app-all.jar --console