Merge branch 'dev' into stt-test-suite

Bram-Hub · Oct 17, 2023 · 93abdee · 93abdee
2 parents 0c316c9 + 535a825
commit 93abdee
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 170 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,6 @@ 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.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'

diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/BlockInVerticalPath b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/BlockInVerticalPath
diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/CannotFillMiddle b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/CannotFillMiddle
diff --git a/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath b/...d/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInHorizontalPath
diff --git a/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath b/build/resources/test/puzzles/lightup/rules/BulbsInPathContradictionRule/LightInVerticalPath
diff --git a/.../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners b/.../resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillCorners
diff --git a/...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle b/...d/resources/test/puzzles/lightup/rules/CannotLightACellContradictionRule/CannotFillMiddle
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/BlockEnclosed
diff --git a/...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed b/...ources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CompleteBoardBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/CornerBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed b/build/resources/test/puzzles/lightup/rules/TooFewBulbsContradictionRule/ManyBlocksEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/BlockEnclosed
diff --git a/...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed b/...urces/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CompleteBoardBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/CornerBlockEnclosed
diff --git a/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed b/build/resources/test/puzzles/lightup/rules/TooManyBulbsContradictionRule/ManyBlocksEnclosed
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,2 @@
 rootProject.name = 'Legup'
-include ':legup'
-include ':legup-update'
 
diff --git a/src/test/resources/puzzles/shorttruthtable/rules/AtomicDirectRule/FalseA b/src/test/resources/puzzles/shorttruthtable/rules/AtomicDirectRule/FalseA
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Legup version="3.0.0">
+    <saved/>
+    <puzzle name="ShortTruthTable">
+        <board>
+            <data>
+                <statement representation="A" row_index="0"/>
+                <statement representation="A" row_index="1"/>
+                <cell char_index="0" row_index="0" type="FALSE"/>
+            </data>
+        </board>
+    </puzzle>
+    <solved isSolved="false" lastSaved="2023-10-13 16:47:40"/>
+</Legup>