Merge pull request #234 from takahirom/takahirom/update-dropbox-diffe…

…r/2023-12-30

Update dropbox differ and remove bom dependency and remove unneeded junit dependency

gradle/libs.versions.toml

@@ -12,17 +12,25 @@ roborazzi-for-replacing-by-include-build = "1.0.0"
 
 androidx-activity = "1.7.2"
 androidx-appcompat = "1.4.1"
-androidx-compose-bom = "2023.03.00"
 androidx-compose-material = "1.4.2"
 androidx-compose-material3 = "1.0.1"
+androidx-compose-foundation = "1.4.0"
+androidx-compose-runtime = "1.4.0"
+androidx-compose-ui = "1.4.0"
+androidx-compose-ui-graphics = "1.4.0"
+androidx-compose-ui-test = "1.4.0"
+androidx-compose-ui-test-junit4 = "1.4.0"
+androidx-compose-ui-test-manifest = "1.4.0"
+androidx-compose-ui-tooling = "1.4.0"
+androidx-compose-ui-tooling-preview = "1.4.0"
 androidx-constraintlayout = "2.1.3"
 androidx-core-ktx = "1.8.0"
 androidx-lifecycle = "2.6.1"
 androidx-navigation = "2.4.1"
 androidx-test-espresso-core = "3.5.1"
 androidx-test-ext-junit = "1.1.5"
 
-dropbox-differ = "0.0.1-alpha1"
+dropbox-differ = "0.0.1"
 google-android-material = "1.5.0"
 json = "20230227"
 junit = "4.13.2"
@@ -42,18 +50,17 @@ kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
 androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
-androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
-androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
+androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose-foundation" }
 androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose-material" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidx-compose-material3" }
-androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
-androidx-compose-ui = { module = "androidx.compose.ui:ui" }
-androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
-androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test" }
-androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
-androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
-androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
-androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose-runtime" }
+androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" }
+androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics", version.ref = "androidx-compose-ui-graphics" }
+androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test", version.ref = "androidx-compose-ui-test" }
+androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose-ui-test-junit4" }
+androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose-ui-test-manifest" }
+androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose-ui-tooling" }
+androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui-tooling-preview" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }

include-build/roborazzi-core/build.gradle

@@ -56,8 +56,6 @@ kotlin {
 
     androidMain {
       dependencies {
-        def composeBom = platform('androidx.compose:compose-bom:2022.12.00')
-        implementation composeBom
         compileOnly libs.robolectric
         compileOnly libs.androidx.compose.ui.test
         compileOnly libs.androidx.compose.ui.test.junit4

include-build/roborazzi-gradle-plugin/build.gradle

@@ -20,7 +20,10 @@ dependencies {
   compileOnly gradleApi()
   compileOnly libs.android.tools.build.gradle
   compileOnly libs.kotlin.gradle.plugin
-  implementation project(':roborazzi-core')
+  implementation(project(':roborazzi-core')) {
+    // We don't use junit for plugin
+    exclude group: 'junit', module: 'junit'
+  }
   implementation libs.json
   integrationTestDepImplementation libs.android.tools.build.gradle
   integrationTestDepImplementation libs.kotlin.gradle.plugin

include-build/roborazzi-gradle-plugin/src/integrationTest/java/io/github/takahirom/roborazzi/RoborazziGradleProject.kt

@@ -234,7 +234,6 @@ dependencies {
   implementation(libs.androidx.lifecycle.runtime.ktx)
   implementation(libs.androidx.activity)
 //  implementation(libs.androidx.activity.compose)
-  implementation(platform(libs.androidx.compose.bom))
 //  implementation(libs.androidx.compose.ui)
 //  implementation(libs.androidx.compose.ui.graphics)
 //  implementation(libs.androidx.compose.ui.tooling.preview)

roborazzi-compose/build.gradle

@@ -15,9 +15,6 @@ android.namespace 'com.github.takahirom.roborazzi.compose'
 dependencies {
   implementation project(':roborazzi')
 
-  def composeBom = platform(libs.androidx.compose.bom)
-  implementation composeBom
-
   testImplementation libs.androidx.compose.runtime
   compileOnly libs.androidx.compose.ui
   compileOnly libs.androidx.activity.compose

roborazzi-junit-rule/build.gradle

@@ -47,8 +47,6 @@ dependencies {
   implementation project(':roborazzi')
   implementation libs.androidx.test.ext.junit.ktx
   compileOnly libs.androidx.test.ext.junit.ktx
-  def composeBom = platform(libs.androidx.compose.bom)
-  implementation composeBom
   compileOnly libs.androidx.compose.ui.test
   compileOnly libs.androidx.compose.ui.test.junit4
 }

roborazzi/build.gradle

@@ -17,9 +17,6 @@ dependencies {
   // Please see settings.gradle
   api "io.github.takahirom.roborazzi:roborazzi-core:$VERSION_NAME"
 
-  def composeBom = platform(libs.androidx.compose.bom)
-  implementation composeBom
-
   testImplementation libs.androidx.compose.runtime
   compileOnly libs.androidx.compose.ui.test
   compileOnly libs.androidx.compose.ui.test.junit4

sample-android/build.gradle

@@ -61,8 +61,6 @@ dependencies {
   testImplementation project(":roborazzi-compose")
   testImplementation project(":roborazzi-junit-rule")
 
-  def composeBom = platform(libs.androidx.compose.bom)
-  implementation composeBom
   implementation libs.androidx.compose.material3
   implementation libs.androidx.compose.ui
   implementation libs.androidx.compose.foundation