LEGUP December 2023 Pull Request

.github/workflows/publish-javadoc.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Publish JavaDoc
-        uses: MathieuSoysal/Javadoc-publisher.yml@v2.3.0
+        uses: MathieuSoysal/Javadoc-publisher.yml@v2.4.0
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           javadoc-branch: javadoc

bin/main/edu/rpi/legup/legup/config

@@ -7,7 +7,7 @@
         <puzzle name="Fillapix"
             qualifiedClassName="edu.rpi.legup.puzzle.fillapix.Fillapix"
             fileType=".xml"
-            fileCreationDisabled="true"/>
+            fileCreationDisabled="false"/>
         <puzzle name="HeyAwake"
             qualifiedClassName="edu.rpi.legup.puzzle.heyawake.Heyawake"
             fileType=".xml"
@@ -40,4 +40,4 @@
 	        fileType=".xml"
 	        fileCreationDisabled="true"/>
     </puzzles>
-</Legup>
+</Legup>

bin/main/edu/rpi/legup/log4j2.properties

@@ -1,15 +1,15 @@
-# Logging level
-# Root logger option
-log4j.rootLogger=DEBUG, stdout, file
-# Redirect log messages to console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p     %c{1}:%L - %m%n
-# Redirect log messages to a log file, support file rolling.
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=Legup.log
-log4j.appender.file.MaxFileSize=5MB
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
+# Logging level
+# Root logger option
+log4j.rootLogger=DEBUG, stdout, file
+# Redirect log messages to console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p     %c{1}:%L - %m%n
+# Redirect log messages to a log file, support file rolling.
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=Legup.log
+log4j.appender.file.MaxFileSize=5MB
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

build.gradle

@@ -16,8 +16,7 @@ sourceCompatibility = 11
 dependencies {
     implementation 'org.jetbrains:annotations:20.1.0'
     implementation 'org.jetbrains:annotations:20.1.0'
-    implementation 'com.formdev:flatlaf:3.0'
-    implementation project(':legup-update')
+    implementation 'com.formdev:flatlaf:3.+'
     implementation 'com.google.firebase:firebase-admin:6.3.0'
     implementation 'org.apache.httpcomponents:httpclient:4.5.1'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'

puzzles files/fillapix/10x10 Fillapix Advanced/FillapixAdvanced10x10_1

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Legup version="2.0.0">
+    <puzzle name="Fillapix">
+        <board width="10" height="10">
+            <cells>
+                <cell value="3" x="2" y="0"/>
+                <cell value="3" x="3" y="0"/>
+                <cell value="3" x="0" y="1"/>
+                <cell value="0" x="6" y="1"/>
+                <cell value="0" x="8" y="1"/>
+                <cell value="3" x="2" y="2"/>
+                <cell value="4" x="3" y="2"/>
+                <cell value="3" x="5" y="2"/>
+                <cell value="3" x="0" y="3"/>
+                <cell value="4" x="2" y="3"/>
+                <cell value="3" x="7" y="3"/>
+                <cell value="2" x="0" y="4"/>
+                <cell value="3" x="1" y="4"/>
+                <cell value="5" x="3" y="4"/>
+                <cell value="4" x="5" y="4"/>
+                <cell value="4" x="6" y="4"/>
+                <cell value="4" x="9" y="4"/>
+                <cell value="5" x="2" y="5"/>
+                <cell value="4" x="3" y="5"/>
+                <cell value="6" x="4" y="5"/>
+                <cell value="6" x="5" y="5"/>
+                <cell value="4" x="7" y="5"/>
+                <cell value="4" x="9" y="5"/>
+                <cell value="3" x="5" y="6"/>
+                <cell value="3" x="6" y="6"/>
+                <cell value="4" x="9" y="6"/>
+                <cell value="3" x="1" y="7"/>
+                <cell value="5" x="4" y="7"/>
+                <cell value="6" x="5" y="7"/>
+                <cell value="5" x="6" y="7"/>
+                <cell value="4" x="9" y="7"/>
+                <cell value="7" x="3" y="8"/>
+                <cell value="7" x="7" y="8"/>
+                <cell value="5" x="9" y="8"/>
+                <cell value="4" x="1" y="9"/>
+                <cell value="6" x="4" y="9"/>
+                <cell value="6" x="6" y="9"/>
+                <cell value="5" x="8" y="9"/>
+            </cells>
+        </board>
+    </puzzle>
+    <Solved isSolved="false"/>
+</Legup>

puzzles files/fillapix/15x15 Fillapix Advanced/FillapixAdvanced15x15_1

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Legup version="3.0.0">
+    <puzzle name="Fillapix">
+        <board height="15" width="15">
+            <cells>
+                <cell value="4" x="3" y="0"/>
+                <cell value="4" x="6" y="0"/>
+                <cell value="6" x="8" y="0"/>
+                <cell value="5" x="10" y="0"/>
+                <cell value="4" x="11" y="0"/>
+                <cell value="1" x="14" y="0"/>
+                <cell value="4" x="1" y="1"/>
+                <cell value="7" x="9" y="1"/>
+                <cell value="4" x="2" y="2"/>
+                <cell value="0" x="5" y="2"/>
+                <cell value="1" x="6" y="2"/>
+                <cell value="4" x="8" y="2"/>
+                <cell value="5" x="10" y="2"/>
+                <cell value="6" x="12" y="2"/>
+                <cell value="4" x="0" y="3"/>
+                <cell value="0" x="3" y="3"/>
+                <cell value="0" x="5" y="3"/>
+                <cell value="3" x="7" y="3"/>
+                <cell value="4" x="10" y="3"/>
+                <cell value="5" x="12" y="3"/>
+                <cell value="4" x="14" y="3"/>
+                <cell value="1" x="2" y="4"/>
+                <cell value="2" x="5" y="4"/>
+                <cell value="3" x="7" y="4"/>
+                <cell value="5" x="8" y="4"/>
+                <cell value="4" x="9" y="4"/>
+                <cell value="4" x="11" y="4"/>
+                <cell value="5" x="12" y="4"/>
+                <cell value="2" x="1" y="5"/>
+                <cell value="3" x="4" y="5"/>
+                <cell value="5" x="6" y="5"/>
+                <cell value="5" x="9" y="5"/>
+                <cell value="5" x="10" y="5"/>
+                <cell value="5" x="11" y="5"/>
+                <cell value="1" x="2" y="6"/>
+                <cell value="2" x="3" y="6"/>
+                <cell value="5" x="5" y="6"/>
+                <cell value="3" x="7" y="6"/>
+                <cell value="4" x="8" y="6"/>
+                <cell value="5" x="14" y="6"/>
+                <cell value="0" x="1" y="7"/>
+                <cell value="0" x="2" y="7"/>
+                <cell value="1" x="3" y="7"/>
+                <cell value="5" x="6" y="7"/>
+                <cell value="6" x="8" y="7"/>
+                <cell value="7" x="10" y="7"/>
+                <cell value="6" x="12" y="7"/>
+                <cell value="4" x="14" y="7"/>
+                <cell value="5" x="8" y="8"/>
+                <cell value="5" x="9" y="8"/>
+                <cell value="6" x="12" y="8"/>
+                <cell value="0" x="1" y="9"/>
+                <cell value="4" x="4" y="9"/>
+                <cell value="6" x="6" y="9"/>
+                <cell value="6" x="10" y="9"/>
+                <cell value="7" x="12" y="9"/>
+                <cell value="8" x="5" y="10"/>
+                <cell value="8" x="7" y="10"/>
+                <cell value="7" x="8" y="10"/>
+                <cell value="7" x="12" y="10"/>
+                <cell value="3" x="14" y="10"/>
+                <cell value="5" x="2" y="11"/>
+                <cell value="7" x="4" y="11"/>
+                <cell value="8" x="6" y="11"/>
+                <cell value="7" x="8" y="11"/>
+                <cell value="7" x="9" y="11"/>
+                <cell value="5" x="12" y="11"/>
+                <cell value="2" x="1" y="12"/>
+                <cell value="8" x="3" y="12"/>
+                <cell value="8" x="5" y="12"/>
+                <cell value="6" x="9" y="12"/>
+                <cell value="5" x="10" y="12"/>
+                <cell value="5" x="14" y="12"/>
+                <cell value="1" x="1" y="13"/>
+                <cell value="5" x="3" y="13"/>
+                <cell value="5" x="5" y="13"/>
+                <cell value="3" x="7" y="13"/>
+                <cell value="5" x="10" y="13"/>
+                <cell value="3" x="12" y="13"/>
+                <cell value="4" x="14" y="13"/>
+                <cell value="2" x="11" y="14"/>
+                <cell value="3" x="12" y="14"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>