Merge pull request #605 from qdsfdhvh/master

Version to 1.8.3
qdsfdhvh · Sep 1, 2024 · 7e6dbc9 · 7e6dbc9
2 parents 46cb2e9 + a0e4250
commit 7e6dbc9
Show file tree

Hide file tree

Showing 42 changed files with 352 additions and 98 deletions.
diff --git a/README.md b/README.md
@@ -17,19 +17,19 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-+                api("io.github.qdsfdhvh:image-loader:1.8.2")
++                api("io.github.qdsfdhvh:image-loader:1.8.3")
                 // optional - Compose Multiplatform Resources Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-compose-resources:1.8.2")
++                api("io.github.qdsfdhvh:image-loader-extension-compose-resources:1.8.3")
                 // optional - Moko Resources Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.2")
++                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.3")
                 // optional - Blur Interceptor (only support bitmap)
-+                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.2")
++                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.3")
             }
         }
         val jvmMain by getting {
             dependencies {
                 // optional - ImageIO Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.2")
++                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.3")
             }
         }
     }

diff --git a/app/common/build.gradle.kts b/app/common/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.compose.resources.ResourcesExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
@@ -80,3 +81,11 @@ kotlin {
 android {
     namespace = "io.github.qdsfdhvh.imageloader.demo.common"
 }
+
+compose {
+    resources {
+        publicResClass = true
+        packageOfResClass = "io.github.qdsfdhvh.imageloader.demo.common"
+        generateResClass = ResourcesExtension.ResourceClassGeneration.Always
+    }
+}
diff --git a/app/common/gradle.properties b/app/common/gradle.properties
diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/MR.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/MR.kt
@@ -1,6 +1,6 @@
 package com.seiko.imageloader.demo
 
-import io.github.qdsfdhvh.common.generated.resources.Res
+import io.github.qdsfdhvh.imageloader.demo.common.Res
 
 internal object MR {
     val images get() = Res.drawable

diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/LocalResourceScene.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/LocalResourceScene.kt
@@ -18,10 +18,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import com.seiko.imageloader.demo.MR
 import com.seiko.imageloader.model.ninePatch
-import io.github.qdsfdhvh.common.generated.resources.car_black
-import io.github.qdsfdhvh.common.generated.resources.cat
-import io.github.qdsfdhvh.common.generated.resources.chat_from_bg_normal_9
-import io.github.qdsfdhvh.common.generated.resources.collection_logo
+import io.github.qdsfdhvh.imageloader.demo.common.car_black
+import io.github.qdsfdhvh.imageloader.demo.common.cat
+import io.github.qdsfdhvh.imageloader.demo.common.chat_from_bg_normal_9
+import io.github.qdsfdhvh.imageloader.demo.common.collection_logo
 
 @Composable
 fun LocalResourceScene(
@@ -53,6 +53,9 @@ fun LocalResourceScene(
                                     skipPadding = 1
                                     maxFactor = 1f
                                 }
+                                options {
+                                    isBitmap = true
+                                }
                             }
                         },
                     )

diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/OtherImagesScene.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/OtherImagesScene.kt
@@ -28,7 +28,7 @@ import androidx.compose.ui.unit.dp
 import co.touchlab.kermit.Logger
 import com.seiko.imageloader.demo.data.imageJsonData
 import com.seiko.imageloader.rememberImagePainter
-import io.github.qdsfdhvh.common.generated.resources.Res
+import io.github.qdsfdhvh.imageloader.demo.common.Res
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 
 @OptIn(ExperimentalResourceApi::class)

diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/WanAndroidScene.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/WanAndroidScene.kt
@@ -23,7 +23,7 @@ import com.seiko.imageloader.demo.MR
 import com.seiko.imageloader.demo.util.JSON
 import com.seiko.imageloader.demo.util.httpEngine
 import com.seiko.imageloader.ui.AutoSizeImage
-import io.github.qdsfdhvh.common.generated.resources.cat
+import io.github.qdsfdhvh.imageloader.demo.common.cat
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
@@ -33,10 +33,8 @@ import io.ktor.client.statement.HttpResponse
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 
-@OptIn(ExperimentalResourceApi::class)
 @Composable
 fun WanAndroidScene(
     onBack: () -> Unit,

diff --git a/build-logic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt
@@ -11,7 +11,7 @@ class KotlinMultiplatformConventionPlugin : Plugin<Project> {
         }
         extensions.configure<KotlinMultiplatformExtension> {
             androidTarget {
-                publishLibraryVariants("debug", "release")
+                publishLibraryVariants("release")
             }
             jvm("desktop")
             iosX64()

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,6 +35,7 @@ apiValidation {
             "desktop",
             "intellij-plugin",
             "test-paparazzi",
+            "test-roborazzi",
         ),
     )
 }
@@ -99,7 +100,7 @@ object ProjectVersion {
     private const val monir = "8"
 
     // backwards compatible bug fixes
-    private const val path = "2"
+    private const val path = "3"
     const val version = "$major.$monir.$path"
 }
 

diff --git a/docs/docs/setup.mdx b/docs/docs/setup.mdx
@@ -15,17 +15,17 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-+                api("io.github.qdsfdhvh:image-loader:1.8.2")
++                api("io.github.qdsfdhvh:image-loader:1.8.3")
                 // optional - Moko Resources Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.2")
++                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.3")
                 // optional - Blur Interceptor (only support bitmap)
-+                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.2")
++                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.3")
             }
         }
         val jvmMain by getting {
             dependencies {
                 // optional - ImageIO Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.2")
++                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.3")
             }
         }
     }
@@ -38,7 +38,7 @@ Copy the following snippets if you are using [gradle version catalog](https://do
 
 ```xml title="libs.versions.toml"
 [versions]
-image-loader = "1.8.2"
+image-loader = "1.8.3"
 
 [libraries]
 image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "image-loader" }

diff --git a/extension/compose-resources/build.gradle.kts b/extension/compose-resources/build.gradle.kts
@@ -11,9 +11,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(projects.imageLoader)
-                // implementation compose resources will auto enable generate res task, so here use compileOnly
-                // https://github.com/JetBrains/compose-multiplatform/blob/dea37a012d06dd64bde9e1fb27e387145eb7d453/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ComposeResources.kt#L34
-                compileOnly(compose.components.resources)
+                implementation(compose.components.resources)
             }
         }
     }

diff --git a/extension/moko-resources/build.gradle.kts b/extension/moko-resources/build.gradle.kts
@@ -22,7 +22,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(projects.imageLoader)
-                implementation("dev.icerock.moko:resources:0.24.1")
+                implementation("dev.icerock.moko:resources:0.24.2")
             }
         }
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-agp = "8.5.1"
+agp = "8.6.0"
 compose-multiplatform = "1.6.11"
 kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.1"
-kotlinx-serialization = "1.7.1"
+kotlinx-serialization = "1.7.2"
 androidx-core-ktx = "1.13.1"
-androidx-collection = "1.4.1"
+androidx-collection = "1.4.3"
 androidx-appcompat = "1.7.0"
 androidx-exifinterface = "1.3.7"
-androidx-activity-compose = "1.9.0"
-androidx-lifecycle-runtime-ktx = "2.8.3"
+androidx-activity-compose = "1.9.1"
+androidx-lifecycle-runtime-ktx = "2.8.4"
 spotless = "6.25.0"
 ktlint = "0.50.0"
 publish = "0.29.0"
@@ -19,14 +19,13 @@ okio = "3.9.0"
 uri-kmp = "0.0.18"
 kermit = "2.0.4"
 androidsvg = "1.4"
-benchmark = "1.2.4"
+benchmark = "1.3.0"
 junit = "4.13.2"
 androidx-test-junit = "1.2.1"
 androidx-test-espresso = "3.6.1"
 androidx-test-uiautomator = "2.3.0"
 profileinstaller = "1.3.1"
-roborazzi = "1.22.2"
-robolectric = "4.13"
+roborazzi = "1.26.0"
 poko = "0.16.0"
 turbine = "1.0.0"
 file-picker = "3.1.0"
@@ -47,7 +46,7 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 baselineProfile = { id = "androidx.baselineprofile", version.ref = "benchmark" }
 roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
 poko = { id = "dev.drewhamilton.poko", version.ref = "poko" }
-binaryCompatibilityValidator =  { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.0" }
+binaryCompatibilityValidator =  { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
 
 [libraries]
 gradlePlugin-android = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -75,11 +74,14 @@ androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator",
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" }
 androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "profileinstaller" }
 
-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+robolectric = { module = "org.robolectric:robolectric", version = "4.13" }
 roborazzi-core = { module = "io.github.takahirom.roborazzi:roborazzi", version.ref = "roborazzi" }
 roborazzi-junit = { module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi" }
-roborazzi-compose = { module = "io.github.takahirom.roborazzi:roborazzi-compose", version.ref = "roborazzi" }
+roborazzi-compose-android = { module = "io.github.takahirom.roborazzi:roborazzi-compose", version.ref = "roborazzi" }
 roborazzi-compose-desktop = { module = "io.github.takahirom.roborazzi:roborazzi-compose-desktop", version.ref = "roborazzi" }
+roborazzi-compose-ios = { module = "io.github.takahirom.roborazzi:roborazzi-compose-ios", version.ref = "roborazzi" }
+roborazzi-compose-preview-scanner-support = { module = "io.github.takahirom.roborazzi:roborazzi-compose-preview-scanner-support", version.ref = "roborazzi" }
+composable-preview-scanner = { module = "com.github.sergio-sastre.ComposablePreviewScanner:android", version = "0.3.0" }
 
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 okio-fakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version.ref = "okio" }
@@ -110,14 +112,3 @@ test-common = [
     "kotlinx-coroutines-test",
     "okio-fakefilesystem",
 ]
-test-android = [
-    "junit",
-    "androidx-test-junit",
-    "robolectric",
-    "roborazzi-core",
-    "roborazzi-junit",
-    "roborazzi-compose"
-]
-test-desktop = [
-    "roborazzi-compose-desktop",
-]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/image-loader/api/android/image-loader.api b/image-loader/api/android/image-loader.api
@@ -38,6 +38,7 @@ public final class com/seiko/imageloader/Image {
 public abstract interface class com/seiko/imageloader/ImageLoader {
 	public static final field Companion Lcom/seiko/imageloader/ImageLoader$Companion;
 	public abstract fun async (Lcom/seiko/imageloader/model/ImageRequest;)Lkotlinx/coroutines/flow/Flow;
+	public abstract fun execute (Lcom/seiko/imageloader/model/ImageRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun getConfig ()Lcom/seiko/imageloader/ImageLoaderConfig;
 }
 
@@ -752,6 +753,13 @@ public final class com/seiko/imageloader/model/ImageRequestBuilder {
 	public static synthetic fun takeFrom$default (Lcom/seiko/imageloader/model/ImageRequestBuilder;Lcom/seiko/imageloader/model/ImageRequest;ZILjava/lang/Object;)V
 }
 
+public final class com/seiko/imageloader/model/ImageRequestExtKt {
+	public static final fun size (Lcom/seiko/imageloader/model/ImageRequestBuilder;F)V
+	public static final fun size (Lcom/seiko/imageloader/model/ImageRequestBuilder;FF)V
+	public static final fun size (Lcom/seiko/imageloader/model/ImageRequestBuilder;Lkotlin/jvm/functions/Function1;)V
+	public static final fun size-d16Qtg0 (Lcom/seiko/imageloader/model/ImageRequestBuilder;J)V
+}
+
 public final class com/seiko/imageloader/model/ImageRequestKt {
 	public static final fun ImageRequest (Lcom/seiko/imageloader/model/ImageRequest;)Lcom/seiko/imageloader/model/ImageRequest;
 	public static final fun ImageRequest (Lcom/seiko/imageloader/model/ImageRequest;Lkotlin/jvm/functions/Function1;)Lcom/seiko/imageloader/model/ImageRequest;
@@ -839,6 +847,7 @@ public final class com/seiko/imageloader/option/Options {
 	public final fun getScale ()Lcom/seiko/imageloader/option/Scale;
 	public final fun getSize-NH-jbRc ()J
 	public fun hashCode ()I
+	public final fun isBitmap ()Z
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -859,7 +868,9 @@ public final class com/seiko/imageloader/option/OptionsBuilder {
 	public final fun getRetryIfDiskDecodeError ()Z
 	public final fun getScale ()Lcom/seiko/imageloader/option/Scale;
 	public final fun getSize-NH-jbRc ()J
+	public final fun isBitmap ()Z
 	public final fun setAllowInexactSize (Z)V
+	public final fun setBitmap (Z)V
 	public final fun setBitmapConfig (Lcom/seiko/imageloader/BitmapConfig;)V
 	public final fun setDiskCachePolicy (Lcom/seiko/imageloader/cache/CachePolicy;)V
 	public final fun setMaxImageSize (I)V

diff --git a/image-loader/api/desktop/image-loader.api b/image-loader/api/desktop/image-loader.api
@@ -32,6 +32,7 @@ public final class com/seiko/imageloader/EmptyPainter : androidx/compose/ui/grap
 public abstract interface class com/seiko/imageloader/ImageLoader {
 	public static final field Companion Lcom/seiko/imageloader/ImageLoader$Companion;
 	public abstract fun async (Lcom/seiko/imageloader/model/ImageRequest;)Lkotlinx/coroutines/flow/Flow;
+	public abstract fun execute (Lcom/seiko/imageloader/model/ImageRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun getConfig ()Lcom/seiko/imageloader/ImageLoaderConfig;
 }
 
@@ -609,6 +610,13 @@ public final class com/seiko/imageloader/model/ImageRequestBuilder {
 	public static synthetic fun takeFrom$default (Lcom/seiko/imageloader/model/ImageRequestBuilder;Lcom/seiko/imageloader/model/ImageRequest;ZILjava/lang/Object;)V
 }
 
+public final class com/seiko/imageloader/model/ImageRequestExtKt {
+	public static final fun size (Lcom/seiko/imageloader/model/ImageRequestBuilder;F)V
+	public static final fun size (Lcom/seiko/imageloader/model/ImageRequestBuilder;FF)V
+	public static final fun size (Lcom/seiko/imageloader/model/ImageRequestBuilder;Lkotlin/jvm/functions/Function1;)V
+	public static final fun size-d16Qtg0 (Lcom/seiko/imageloader/model/ImageRequestBuilder;J)V
+}
+
 public final class com/seiko/imageloader/model/ImageRequestKt {
 	public static final fun ImageRequest (Lcom/seiko/imageloader/model/ImageRequest;)Lcom/seiko/imageloader/model/ImageRequest;
 	public static final fun ImageRequest (Lcom/seiko/imageloader/model/ImageRequest;Lkotlin/jvm/functions/Function1;)Lcom/seiko/imageloader/model/ImageRequest;
@@ -696,6 +704,7 @@ public final class com/seiko/imageloader/option/Options {
 	public final fun getScale ()Lcom/seiko/imageloader/option/Scale;
 	public final fun getSize-NH-jbRc ()J
 	public fun hashCode ()I
+	public final fun isBitmap ()Z
 	public fun toString ()Ljava/lang/String;
 }
 
@@ -716,7 +725,9 @@ public final class com/seiko/imageloader/option/OptionsBuilder {
 	public final fun getRetryIfDiskDecodeError ()Z
 	public final fun getScale ()Lcom/seiko/imageloader/option/Scale;
 	public final fun getSize-NH-jbRc ()J
+	public final fun isBitmap ()Z
 	public final fun setAllowInexactSize (Z)V
+	public final fun setBitmap (Z)V
 	public final fun setBitmapConfig (Lcom/seiko/imageloader/BitmapConfig;)V
 	public final fun setDiskCachePolicy (Lcom/seiko/imageloader/cache/CachePolicy;)V
 	public final fun setMaxImageSize (I)V