Merge pull request #581 from qdsfdhvh/master

Version to 1.8.2
qdsfdhvh · Jul 18, 2024 · 46cb2e9 · 46cb2e9
2 parents 52d38f5 + 70372d5
commit 46cb2e9
Show file tree

Hide file tree

Showing 55 changed files with 3,022 additions and 1,018 deletions.
diff --git a/.github/workflows/Check.yml b/.github/workflows/Check.yml
@@ -60,6 +60,28 @@ jobs:
       - name: Lint
         run: ./gradlew lint --stacktrace
 
+  api-check:
+    needs: spotless
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v3
+
+      - name: Copy CI gradle.properties
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Lint
+        run: ./gradlew apiCheck --stacktrace
+
   test:
     needs: spotless
     runs-on: ubuntu-latest

diff --git a/.github/workflows/CompareScreenshot.yml b/.github/workflows/CompareScreenshot.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Set up JDK 17
         uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
@@ -30,12 +30,12 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3.3.2
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
         with:
           gradle-version: wrapper
 
       # Download screenshots from main branch
-      - uses: dawidd6/action-download-artifact@v2
+      - uses: dawidd6/action-download-artifact@v6
         continue-on-error: true
         with:
           name: screenshot

diff --git a/.github/workflows/StoreScreenshot.yml b/.github/workflows/StoreScreenshot.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Set up JDK 17
         uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
@@ -33,7 +33,7 @@ jobs:
 
       # Better than caching and/or extensions of actions/setup-java
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff # v3.3.2
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
         with:
           gradle-version: wrapper
 

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.1")
++                api("io.github.qdsfdhvh:image-loader:1.8.2")
                 // optional - Compose Multiplatform Resources Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-compose-resources:1.8.1")
++                api("io.github.qdsfdhvh:image-loader-extension-compose-resources:1.8.2")
                 // optional - Moko Resources Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.1")
++                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.2")
                 // optional - Blur Interceptor (only support bitmap)
-+                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.1")
++                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.2")
             }
         }
         val jvmMain by getting {
             dependencies {
                 // optional - ImageIO Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.1")
++                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.2")
             }
         }
     }

diff --git a/app/android/src/release/generated/baselineProfiles/baseline-prof.txt b/app/android/src/release/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/android/src/release/generated/baselineProfiles/startup-prof.txt b/app/android/src/release/generated/baselineProfiles/startup-prof.txt
diff --git a/app/common/build.gradle.kts b/app/common/build.gradle.kts
@@ -20,7 +20,6 @@ kotlin {
                 api(compose.foundation)
                 api(compose.ui)
                 api(compose.material)
-                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
                 implementation(compose.components.resources)
 
                 api(projects.imageLoaderSingleton)

diff --git a/app/intellij-plugin/build.gradle.kts b/app/intellij-plugin/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.intellij") version "1.17.3"
+    id("org.jetbrains.intellij") version "1.17.4"
     java
     id("app.kotlin.jvm")
     id("app.compose.multiplatform")
@@ -16,7 +16,6 @@ repositories {
     google()
     mavenCentral()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/

diff --git a/app/wasmJs/build.gradle.kts b/app/wasmJs/build.gradle.kts
@@ -33,8 +33,4 @@ kotlin {
 }
 
 compose.experimental {
-    web.application {
-    }
 }
-
-applyKtorWasmWorkaround(libs.versions.ktor.wasm.get())
diff --git a/app/web/build.gradle.kts b/app/web/build.gradle.kts
@@ -15,7 +15,6 @@ kotlin {
             dependencies {
                 implementation(projects.app.common)
                 implementation(compose.runtime)
-                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
                 implementation(compose.components.resources)
                 implementation(libs.okio.fakefilesystem)
             }

diff --git a/build-logic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt
@@ -19,7 +19,7 @@ class KotlinMultiplatformConventionPlugin : Plugin<Project> {
             iosSimulatorArm64()
             macosX64()
             macosArm64()
-            js(IR) {
+            js {
                 browser()
             }
             @Suppress("OPT_IN_USAGE")
@@ -52,8 +52,10 @@ class KotlinMultiplatformConventionPlugin : Plugin<Project> {
                                     withMacosArm64()
                                 }
                             }
-                            withJs()
-                            withWasmJs()
+                            group("commonJs") {
+                                withJs()
+                                withWasmJs()
+                            }
                         }
                     }
                 }
@@ -70,6 +72,5 @@ class KotlinMultiplatformConventionPlugin : Plugin<Project> {
             }
         }
         configKotlin()
-        applyKtorWasmWorkaround(libs.findVersion("ktor-wasm").get().toString())
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/Project.kt b/build-logic/convention/src/main/kotlin/Project.kt
@@ -33,19 +33,3 @@ fun Project.configJava() {
         targetCompatibility = JavaVersion.VERSION_11
     }
 }
-
-// TODO: Remove when ktor 3.0.0 rc
-// https://youtrack.jetbrains.com/issue/KTOR-5587
-fun Project.applyKtorWasmWorkaround(version: String) {
-    configurations.all {
-        if (name.startsWith("wasmJs")) {
-            resolutionStrategy.eachDependency {
-                if (requested.group.startsWith("io.ktor") &&
-                    requested.name.startsWith("ktor-")
-                ) {
-                    useVersion(version)
-                }
-            }
-        }
-    }
-}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
     alias(libs.plugins.spotless)
     alias(libs.plugins.publish)
     alias(libs.plugins.dokka)
+    alias(libs.plugins.binaryCompatibilityValidator)
 }
 
 spotless {
@@ -26,6 +27,18 @@ spotless {
     }
 }
 
+apiValidation {
+    ignoredProjects.addAll(
+        listOf(
+            "android",
+            "common",
+            "desktop",
+            "intellij-plugin",
+            "test-paparazzi",
+        ),
+    )
+}
+
 allprojects {
     group = "io.github.qdsfdhvh"
     version = ProjectVersion.version
@@ -86,7 +99,7 @@ object ProjectVersion {
     private const val monir = "8"
 
     // backwards compatible bug fixes
-    private const val path = "1"
+    private const val path = "2"
     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.1")
++                api("io.github.qdsfdhvh:image-loader:1.8.2")
                 // optional - Moko Resources Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.1")
++                api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.8.2")
                 // optional - Blur Interceptor (only support bitmap)
-+                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.1")
++                api("io.github.qdsfdhvh:image-loader-extension-blur:1.8.2")
             }
         }
         val jvmMain by getting {
             dependencies {
                 // optional - ImageIO Decoder
-+                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.1")
++                api("io.github.qdsfdhvh:image-loader-extension-imageio:1.8.2")
             }
         }
     }
@@ -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.1"
+image-loader = "1.8.2"
 
 [libraries]
 image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "image-loader" }

diff --git a/extension/compose-resources/api/android/compose-resources.api b/extension/compose-resources/api/android/compose-resources.api
@@ -0,0 +1,11 @@
+public final class com/seiko/imageloader/component/fetcher/ComposeResourceFetcher {
+	public static final field $stable I
+	public fun <init> ()V
+}
+
+public final class com/seiko/imageloader/component/fetcher/ComposeResourceFetcher$Factory : com/seiko/imageloader/component/fetcher/Fetcher$Factory {
+	public static final field $stable I
+	public fun <init> ()V
+	public fun create (Ljava/lang/Object;Lcom/seiko/imageloader/option/Options;)Lcom/seiko/imageloader/component/fetcher/Fetcher;
+}
+
diff --git a/extension/compose-resources/api/desktop/compose-resources.api b/extension/compose-resources/api/desktop/compose-resources.api
@@ -0,0 +1,11 @@
+public final class com/seiko/imageloader/component/fetcher/ComposeResourceFetcher {
+	public static final field $stable I
+	public fun <init> ()V
+}
+
+public final class com/seiko/imageloader/component/fetcher/ComposeResourceFetcher$Factory : com/seiko/imageloader/component/fetcher/Fetcher$Factory {
+	public static final field $stable I
+	public fun <init> ()V
+	public fun create (Ljava/lang/Object;Lcom/seiko/imageloader/option/Options;)Lcom/seiko/imageloader/component/fetcher/Fetcher;
+}
+
diff --git a/extension/compose-resources/build.gradle.kts b/extension/compose-resources/build.gradle.kts
@@ -12,8 +12,7 @@ kotlin {
             dependencies {
                 implementation(projects.imageLoader)
                 // implementation compose resources will auto enable generate res task, so here use compileOnly
-                // https://github.com/JetBrains/compose-multiplatform/blob/master/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesGenerator.kt#L143
-                @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
+                // 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)
             }
         }

diff --git a/extension/imageio/api/imageio.api b/extension/imageio/api/imageio.api
@@ -0,0 +1,10 @@
+public final class com/seiko/imageloader/component/decoder/ImageIODecoder : com/seiko/imageloader/component/decoder/Decoder {
+	public fun <init> (Lokio/BufferedSource;)V
+	public fun decode (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/seiko/imageloader/component/decoder/ImageIODecoder$Factory : com/seiko/imageloader/component/decoder/Decoder$Factory {
+	public fun <init> ()V
+	public fun create (Lcom/seiko/imageloader/model/ImageResult$OfSource;Lcom/seiko/imageloader/option/Options;)Lcom/seiko/imageloader/component/decoder/Decoder;
+}
+
diff --git a/extension/imageio/build.gradle.kts b/extension/imageio/build.gradle.kts
@@ -11,7 +11,7 @@ kotlin {
             dependencies {
                 implementation(projects.imageLoader)
                 // svg
-                implementation("com.twelvemonkeys.imageio:imageio-batik:3.10.1")
+                implementation("com.twelvemonkeys.imageio:imageio-batik:3.11.0")
                 implementation("org.apache.xmlgraphics:batik-transcoder:1.17")
             }
         }

diff --git a/extension/ktor-network/api/android/ktor-network.api b/extension/ktor-network/api/android/ktor-network.api
@@ -0,0 +1,59 @@
+public final class com/seiko/imageloader/component/SetupKtorComponentsKt {
+	public static final fun setupKtorComponents (Lcom/seiko/imageloader/component/ComponentRegistryBuilder;Lkotlin/jvm/functions/Function0;)V
+	public static synthetic fun setupKtorComponents$default (Lcom/seiko/imageloader/component/ComponentRegistryBuilder;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+}
+
+public final class com/seiko/imageloader/component/fetcher/KtorUrlFetcher : com/seiko/imageloader/component/fetcher/Fetcher {
+	public static final field Companion Lcom/seiko/imageloader/component/fetcher/KtorUrlFetcher$Companion;
+	public synthetic fun <init> (Lio/ktor/http/Url;Lkotlin/jvm/functions/Function0;Lcom/seiko/imageloader/model/KtorRequestData;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun fetch (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class com/seiko/imageloader/component/fetcher/KtorUrlFetcher$Companion {
+	public final fun getDefaultHttpEngineFactory ()Lkotlin/jvm/functions/Function0;
+}
+
+public final class com/seiko/imageloader/component/fetcher/KtorUrlFetcher$Factory : com/seiko/imageloader/component/fetcher/Fetcher$Factory {
+	public fun <init> (Lkotlin/jvm/functions/Function0;)V
+	public fun create (Ljava/lang/Object;Lcom/seiko/imageloader/option/Options;)Lcom/seiko/imageloader/component/fetcher/Fetcher;
+}
+
+public final class com/seiko/imageloader/component/keyer/KtorUrlKeyer : com/seiko/imageloader/component/keyer/Keyer {
+	public fun <init> ()V
+	public fun key (Ljava/lang/Object;Lcom/seiko/imageloader/option/Options;Lcom/seiko/imageloader/component/keyer/Keyer$Type;)Ljava/lang/String;
+}
+
+public final class com/seiko/imageloader/component/mapper/KtorUrlMapper : com/seiko/imageloader/component/mapper/Mapper {
+	public fun <init> ()V
+	public fun map (Ljava/lang/Object;Lcom/seiko/imageloader/option/Options;)Lio/ktor/http/Url;
+	public synthetic fun map (Ljava/lang/Object;Lcom/seiko/imageloader/option/Options;)Ljava/lang/Object;
+}
+
+public final class com/seiko/imageloader/model/KtorRequestData {
+	public fun <init> (Lio/ktor/http/HttpMethod;Ljava/util/Map;)V
+	public final fun component1 ()Lio/ktor/http/HttpMethod;
+	public final fun component2 ()Ljava/util/Map;
+	public final fun copy (Lio/ktor/http/HttpMethod;Ljava/util/Map;)Lcom/seiko/imageloader/model/KtorRequestData;
+	public static synthetic fun copy$default (Lcom/seiko/imageloader/model/KtorRequestData;Lio/ktor/http/HttpMethod;Ljava/util/Map;ILjava/lang/Object;)Lcom/seiko/imageloader/model/KtorRequestData;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getHeaders ()Ljava/util/Map;
+	public final fun getMethod ()Lio/ktor/http/HttpMethod;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/seiko/imageloader/model/KtorRequestDataBuilder {
+	public final fun build ()Lcom/seiko/imageloader/model/KtorRequestData;
+	public final fun getMethod ()Lio/ktor/http/HttpMethod;
+	public final fun headers (Lkotlin/jvm/functions/Function1;)V
+	public final fun setMethod (Lio/ktor/http/HttpMethod;)V
+}
+
+public final class com/seiko/imageloader/model/KtorRequestDataKt {
+	public static final fun KtorRequestData (Lkotlin/jvm/functions/Function1;)Lcom/seiko/imageloader/model/KtorRequestData;
+}
+
+public final class com/seiko/imageloader/model/Option_ktorKt {
+	public static final fun ktorRequest (Lcom/seiko/imageloader/option/OptionsBuilder;Lkotlin/jvm/functions/Function1;)V
+}
+