Merge pull request #496 from eyedol/eyedol/migrateIosImplementationTo…

…UseRoboCanvasInterface Initial integration of differ to support iOS
takahirom · Oct 8, 2024 · 828760f · 828760f
2 parents 078140d + 2564abe
commit 828760f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ androidx-test-espresso-core = "3.5.1"
 androidx-test-ext-junit = "1.2.1"
 kim = "0.17.7"
 
-dropbox-differ = "0.0.2"
+dropbox-differ = "0.3.0"
 google-android-material = "1.5.0"
 junit = "4.13.2"
 ktor-serialization-kotlinx-xml = "2.3.11"

diff --git a/include-build/roborazzi-core/build.gradle b/include-build/roborazzi-core/build.gradle
@@ -37,6 +37,7 @@ kotlin {
     commonMain {
       dependencies {
         compileOnly libs.kotlinx.serialization.json
+        api libs.dropbox.differ
         implementation libs.kotlinx.io.core
       }
     }
@@ -51,7 +52,6 @@ kotlin {
     }
     commonJvmMain {
       dependencies {
-        api libs.dropbox.differ
         implementation libs.junit
       }
     }

diff --git a/.../github/takahirom/roborazzi/RoboCanvas.kt → .../github/takahirom/roborazzi/RoboCanvas.kt b/.../github/takahirom/roborazzi/RoboCanvas.kt → .../github/takahirom/roborazzi/RoboCanvas.kt
diff --git a/roborazzi-compose-ios/build.gradle b/roborazzi-compose-ios/build.gradle
@@ -33,12 +33,10 @@ kotlin {
         implementation(libs.kotlinx.serialization.json)
         api(project.compose.dependencies.uiTest)
         implementation(compose.runtime)
+        api libs.dropbox.differ
       }
     }
-    iosMain {
-      dependencies {
-      }
-    }
+
     iosTest {
       dependencies {
         implementation(compose.material3)

diff --git a/roborazzi-painter/build.gradle b/roborazzi-painter/build.gradle
@@ -33,13 +33,13 @@ kotlin {
         compileOnly libs.kotlinx.serialization.json
         // Please see settings.gradle
         api "io.github.takahirom.roborazzi:roborazzi-core:$VERSION_NAME"
+        api libs.dropbox.differ
       }
     }
     commonJvmMain {
       dependencies {
         compileOnly libs.robolectric.android.all
         implementation libs.kotlinx.io.core
-        api libs.dropbox.differ
 
       }
     }

diff --git a/roborazzi-painter/src/commonJvmMain/kotlin/com/github/takahirom/roborazzi/AwtRoboCanvas.kt b/roborazzi-painter/src/commonJvmMain/kotlin/com/github/takahirom/roborazzi/AwtRoboCanvas.kt
@@ -275,9 +275,9 @@ class AwtRoboCanvas(width: Int, height: Int, filled: Boolean, bufferedImageType:
   }
 
   override fun differ(
-    other: RoboCanvas,
-    resizeScale: Double,
-    imageComparator: ImageComparator
+      other: RoboCanvas,
+      resizeScale: Double,
+      imageComparator: ImageComparator
   ): ImageComparator.ComparisonResult {
     other as AwtRoboCanvas
     val otherImage = other.bufferedImage