Fix some build warnings

domain/build.gradle.kts

@@ -8,7 +8,11 @@ kotlin {
     jvmToolchain(libs.versions.jdk.get().toInt())
 
     jvm()
-    androidTarget()
+    androidLibrary {
+        namespace = "ch.dissem.yaep.domain"
+        compileSdk = libs.versions.android.compileSdk.get().toInt()
+        minSdk = libs.versions.android.minSdk.get().toInt()
+    }
 
     sourceSets {
         commonMain.dependencies {
@@ -21,25 +25,3 @@ kotlin {
         }
     }
 }
-
-android {
-    namespace = "ch.dissem.yaep.domain"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-
-    defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
-    }
-
-    sourceSets {
-        getByName("test") {
-            resources.srcDirs("src/commonTest/resources")
-        }
-    }
-
-    buildTypes {
-        debug {
-            enableAndroidTestCoverage = true
-            enableUnitTestCoverage = true
-        }
-    }
-}

domain/src/commonTest/kotlin/ch/dissem/yaep/domain/SameColumnClueTest.kt

@@ -14,8 +14,11 @@ class SameColumnClueTest : ClueTest() {
                     val a = grid[ia][j]
                     val b = grid[ib][j]
 
-                    expect(SameColumnClue(a.solution!!, b.solution!!).isValid(grid)).toEqual(true)
-                    expect(SameColumnClue(b.solution!!, a.solution!!).isValid(grid)).toEqual(true)
+                    a.solution!!
+                    b.solution!!
+
+                    expect(SameColumnClue(a.solution, b.solution).isValid(grid)).toEqual(true)
+                    expect(SameColumnClue(b.solution, a.solution).isValid(grid)).toEqual(true)
                 }
             }
         }
@@ -32,8 +35,11 @@ class SameColumnClueTest : ClueTest() {
                         val a = grid[ia][ja]
                         val b = grid[ib][jb]
 
-                        expect(SameColumnClue(a.solution!!, b.solution!!).isValid(grid)).toEqual(false)
-                        expect(SameColumnClue(b.solution!!, a.solution!!).isValid(grid)).toEqual(false)
+                        a.solution!!
+                        b.solution!!
+
+                        expect(SameColumnClue(a.solution, b.solution).isValid(grid)).toEqual(false)
+                        expect(SameColumnClue(b.solution, a.solution).isValid(grid)).toEqual(false)
                     }
                 }
             }
@@ -51,11 +57,14 @@ class SameColumnClueTest : ClueTest() {
                         val a = grid[ia][ja]
                         val b = grid[ib][jb]
 
+                        a.solution!!
+                        b.solution!!
+
                         a.selection = a.solution
                         b.selection = b.solution
 
-                        expect(SameColumnClue(a.solution!!, b.solution!!).isValid(grid)).toEqual(false)
-                        expect(SameColumnClue(b.solution!!, a.solution!!).isValid(grid)).toEqual(false)
+                        expect(SameColumnClue(a.solution, b.solution).isValid(grid)).toEqual(false)
+                        expect(SameColumnClue(b.solution, a.solution).isValid(grid)).toEqual(false)
                     }
                 }
             }
@@ -72,6 +81,10 @@ class SameColumnClueTest : ClueTest() {
         for (i in 0 until size) {
             val a = rowA[i]
             val b = rowB[i]
+
+            a.solution!!
+            b.solution!!
+
             rowA.forEachIndexed { index, gameCell ->
                 if (index < i) {
                     gameCell.selection = rowA.options.filter { it != a.solution }.random()
@@ -87,8 +100,8 @@ class SameColumnClueTest : ClueTest() {
                 }
             }
 
-            expect(SameColumnClue(a.solution!!, b.solution!!).isValid(grid)).toEqual(false)
-            expect(SameColumnClue(b.solution!!, a.solution!!).isValid(grid)).toEqual(false)
+            expect(SameColumnClue(a.solution, b.solution).isValid(grid)).toEqual(false)
+            expect(SameColumnClue(b.solution, a.solution).isValid(grid)).toEqual(false)
         }
     }
 }

domain/src/commonTest/kotlin/ch/dissem/yaep/domain/TripletClueTest.kt

@@ -17,8 +17,12 @@ class TripletClueTest : ClueTest() {
                         val b = grid[ib][j - 1]
                         val c = grid[ic][j]
 
-                        expect(TripletClue(a.solution!!, b.solution!!, c.solution!!).isValid(grid)).toEqual(true)
-                        expect(TripletClue(c.solution!!, b.solution!!, a.solution!!).isValid(grid)).toEqual(true)
+                        a.solution!!
+                        b.solution!!
+                        c.solution!!
+
+                        expect(TripletClue(a.solution, b.solution, c.solution).isValid(grid)).toEqual(true)
+                        expect(TripletClue(c.solution, b.solution, a.solution).isValid(grid)).toEqual(true)
                     }
                 }
             }
@@ -36,16 +40,20 @@ class TripletClueTest : ClueTest() {
         val b = rowB[2]
         val c = rowC[3]
 
+        a.solution!!
+        b.solution!!
+        c.solution!!
+
         rowB[0].selection = b.solution
 
-        expect(TripletClue(a.solution!!, b.solution!!, c.solution!!).isValid(grid)).toEqual(false)
-        expect(TripletClue(c.solution!!, b.solution!!, a.solution!!).isValid(grid)).toEqual(false)
+        expect(TripletClue(a.solution, b.solution, c.solution).isValid(grid)).toEqual(false)
+        expect(TripletClue(c.solution, b.solution, a.solution).isValid(grid)).toEqual(false)
 
         rowB[0].selection = null
         rowB[grid.size - 1].selection = b.solution
 
-        expect(TripletClue(a.solution!!, b.solution!!, c.solution!!).isValid(grid)).toEqual(false)
-        expect(TripletClue(c.solution!!, b.solution!!, a.solution!!).isValid(grid)).toEqual(false)
+        expect(TripletClue(a.solution, b.solution, c.solution).isValid(grid)).toEqual(false)
+        expect(TripletClue(c.solution, b.solution, a.solution).isValid(grid)).toEqual(false)
     }
 
     @Test
@@ -61,10 +69,14 @@ class TripletClueTest : ClueTest() {
         val rowC = grid[1]
         val c = rowC[ic]
 
-        val clue = TripletClue(a.solution!!, b.solution!!, c.solution!!)
+        a.solution!!
+        b.solution!!
+        c.solution!!
+
+        val clue = TripletClue(a.solution, b.solution, c.solution)
 
         b.selection = b.solution
-        c.options.add(c.solution!!)
+        c.options.add(c.solution)
 
 
         rowA.forEachIndexed { index, notA ->
@@ -75,7 +87,7 @@ class TripletClueTest : ClueTest() {
                 }
 
                 index == ic -> {
-                    rowC[ia].options.add(c.solution!!)
+                    rowC[ia].options.add(c.solution)
                     expect(clue.isValid(grid)).toEqual(true)
                 }
 
@@ -94,11 +106,15 @@ class TripletClueTest : ClueTest() {
         val b = grid[0][2]
         val c = grid[1][3]
 
+        a.solution!!
+        b.solution!!
+        c.solution!!
+
         a.selection = a.solution
         grid[1][4].selection = c.solution
 
-        expect(TripletClue(a.solution!!, b.solution!!, c.solution!!).isValid(grid)).toEqual(false)
-        expect(TripletClue(c.solution!!, b.solution!!, a.solution!!).isValid(grid)).toEqual(false)
+        expect(TripletClue(a.solution, b.solution, c.solution).isValid(grid)).toEqual(false)
+        expect(TripletClue(c.solution, b.solution, a.solution).isValid(grid)).toEqual(false)
     }
 
     @Test
@@ -111,15 +127,19 @@ class TripletClueTest : ClueTest() {
         val b = rowB[2]
         val c = rowC[1]
 
+        a.solution!!
+        b.solution!!
+        c.solution!!
+
         a.selection = a.solution
         b.options.clear()
         c.options.clear()
 
-        rowB[4].options.add(b.solution!!)
-        rowC[5].options.add(c.solution!!)
+        rowB[4].options.add(b.solution)
+        rowC[5].options.add(c.solution)
 
-        expect(TripletClue(a.solution!!, b.solution!!, c.solution!!).isValid(grid)).toEqual(true)
-        expect(TripletClue(c.solution!!, b.solution!!, a.solution!!).isValid(grid)).toEqual(true)
+        expect(TripletClue(a.solution, b.solution, c.solution).isValid(grid)).toEqual(true)
+        expect(TripletClue(c.solution, b.solution, a.solution).isValid(grid)).toEqual(true)
     }
 
     @Test
@@ -132,11 +152,15 @@ class TripletClueTest : ClueTest() {
         val b = rowB[2]
         val c = rowC[1]
 
+        a.solution!!
+        b.solution!!
+        c.solution!!
+
         a.selection = a.solution
         rowB[4].selection = rowC[3].solution
         c.selection = rowC[3].solution
 
-        expect(TripletClue(a.solution!!, b.solution!!, c.solution!!).isValid(grid)).toEqual(false)
-        expect(TripletClue(c.solution!!, b.solution!!, a.solution!!).isValid(grid)).toEqual(false)
+        expect(TripletClue(a.solution, b.solution, c.solution).isValid(grid)).toEqual(false)
+        expect(TripletClue(c.solution, b.solution, a.solution).isValid(grid)).toEqual(false)
     }
 }