Merge pull request #552 from skydoves/coil3/wasmjs

Support withWasmJs for coil3
skydoves · Sep 12, 2024 · 03d245f · 03d245f
2 parents 43c0913 + 1adb9b0
commit 03d245f
Show file tree

Hide file tree

Showing 12 changed files with 189 additions and 17 deletions.
diff --git a/app/src/main/kotlin/com/github/skydoves/landscapistdemo/App.kt b/app/src/main/kotlin/com/github/skydoves/landscapistdemo/App.kt
@@ -21,9 +21,10 @@ import android.content.Context
 import androidx.multidex.MultiDexApplication
 import coil3.ImageLoader
 import coil3.SingletonImageLoader
-import coil3.network.ktor2.KtorNetworkFetcherFactory
+import coil3.network.ktor3.KtorNetworkFetcherFactory
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
+import com.facebook.imagepipeline.core.DownsampleMode
 import dagger.hilt.android.HiltAndroidApp
 import okhttp3.OkHttpClient
 
@@ -38,7 +39,7 @@ class App : MultiDexApplication(), SingletonImageLoader.Factory {
       OkHttpImagePipelineConfigFactory
         .newBuilder(this, OkHttpClient.Builder().build())
         .setDiskCacheEnabled(true)
-        .setDownsampleEnabled(true)
+        .setDownsampleMode(DownsampleMode.AUTO)
         .setResizeAndRotateEnabledForNetwork(true)
         .build()
 

diff --git a/benchmark-landscapist-app/src/main/kotlin/com/skydoves/benchmark/landscapist/app/App.kt b/benchmark-landscapist-app/src/main/kotlin/com/skydoves/benchmark/landscapist/app/App.kt
@@ -21,7 +21,7 @@ import android.app.Application
 import android.content.Context
 import coil3.ImageLoader
 import coil3.SingletonImageLoader
-import coil3.network.ktor2.KtorNetworkFetcherFactory
+import coil3.network.ktor3.KtorNetworkFetcherFactory
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory
 import com.facebook.imagepipeline.core.DownsampleMode

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -30,6 +30,10 @@ gradlePlugin {
       id = "landscapist.library.compose.multiplatform"
       implementationClass = "ComposeMultiplatformLibraryConventionPlugin"
     }
+    register("composeMultiplatformWasmLibrary") {
+      id = "landscapist.library.compose.multiplatformWasm"
+      implementationClass = "ComposeMultiplatformWasmLibraryConventionPlugin"
+    }
     register("spotless") {
       id = "landscapist.spotless"
       implementationClass = "SpotlessConventionPlugin"

diff --git a/build-logic/convention/src/main/kotlin/ComposeMultiplatformWasmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/ComposeMultiplatformWasmLibraryConventionPlugin.kt
@@ -0,0 +1,58 @@
+/*
+ * Designed and developed by 2020-2022 skydoves (Jaewoong Eum)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.android.build.gradle.LibraryExtension
+import com.skydoves.landscapist.configureAndroidCompose
+import com.skydoves.landscapist.configureComposeMultiplatform
+import com.skydoves.landscapist.configureKotlinAndroid
+import com.skydoves.landscapist.kotlinOptions
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+class ComposeMultiplatformWasmLibraryConventionPlugin : Plugin<Project> {
+  override fun apply(target: Project) {
+    with(target) {
+      pluginManager.apply("com.android.library")
+      pluginManager.apply("org.jetbrains.kotlin.multiplatform")
+      pluginManager.apply("org.jetbrains.compose")
+      pluginManager.apply("com.vanniktech.maven.publish")
+      pluginManager.apply("binary-compatibility-validator")
+      pluginManager.apply("androidx.baselineprofile")
+
+      extensions.configure<LibraryExtension> libraryExtension@{
+        extensions.configure<KotlinMultiplatformExtension> kmpExtension@{
+          configureComposeMultiplatform(this@libraryExtension, this@kmpExtension)
+        }
+      }
+
+      val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+      tasks.withType(JavaCompile::class.java).configureEach {
+        this.targetCompatibility = libs.findVersion("jvmTarget").get().toString()
+        this.sourceCompatibility = libs.findVersion("jvmTarget").get().toString()
+      }
+
+      dependencies {
+        add("baselineProfile", project(":benchmark-landscapist"))
+      }
+    }
+  }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatform.kt b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatform.kt
@@ -38,14 +38,18 @@ internal fun Project.configureComposeMultiplatform(
     androidTarget { publishLibraryVariants("release") }
     jvm("desktop")
 
-    js {
-      browser()
-      nodejs()
-      binaries.executable()
-      binaries.library()
-    }
+    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-      binaries.executable()
+      browser {
+        testTask {
+          enabled = false
+        }
+      }
+      nodejs {
+        testTask {
+          enabled = false
+        }
+      }
       binaries.library()
     }
 

diff --git a/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt b/build-logic/convention/src/main/kotlin/com/skydoves/landscapist/ComposeMultiplatformWasm.kt
@@ -0,0 +1,105 @@
+/*
+ * Designed and developed by 2020-2022 skydoves (Jaewoong Eum)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("UnstableApiUsage")
+
+package com.skydoves.landscapist
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.kotlin.dsl.invoke
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
+/**
+ * Configure Compose-Multiplatform-specific options
+ */
+internal fun Project.configureComposeMultiplatformWasm(
+  commonExtension: CommonExtension<*, *, *, *, *, *>,
+  kotlinMultiplatformExtension: KotlinMultiplatformExtension,
+) {
+  pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
+
+  kotlinMultiplatformExtension.apply {
+    androidTarget { publishLibraryVariants("release") }
+    jvm("desktop")
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+      browser {
+        testTask {
+          enabled = false
+        }
+      }
+      nodejs {
+        testTask {
+          enabled = false
+        }
+      }
+      binaries.library()
+    }
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    macosX64()
+    macosArm64()
+
+    @Suppress("OPT_IN_USAGE")
+    applyHierarchyTemplate {
+      common {
+        group("jvm") {
+          withAndroidTarget()
+          withJvm()
+        }
+        group("skia") {
+          withJvm()
+          group("darwin") {
+            group("apple") {
+              group("ios") {
+                withIosX64()
+                withIosArm64()
+                withIosSimulatorArm64()
+              }
+              group("macos") {
+                withMacosX64()
+                withMacosArm64()
+              }
+            }
+            withJs()
+            withWasmJs()
+          }
+        }
+      }
+    }
+
+    explicitApi()
+  }
+
+  commonExtension.apply {
+    buildFeatures {
+      compose = true
+    }
+
+    packaging {
+      resources {
+        excludes.add("/META-INF/{AL2.0,LGPL2.1}")
+      }
+    }
+  }
+}
diff --git a/coil3/build.gradle.kts b/coil3/build.gradle.kts
@@ -16,7 +16,7 @@
 import com.github.skydoves.landscapist.Configuration
 
 plugins {
-  id("landscapist.library.compose.multiplatform")
+  id("landscapist.library.compose.multiplatformWasm")
   id("landscapist.spotless")
 }
 
@@ -47,7 +47,7 @@ kotlin {
       dependencies {
         api(project(":landscapist"))
         api(libs.coil3)
-        api(libs.coil3.network.ktor2)
+        api(libs.coil3.network.ktor3)
         api(libs.ktor.core)
 
         implementation(compose.ui)

diff --git a/coil3/src/commonMain/kotlin/com/skydoves/landscapist/coil3/LocalCoilProvider.kt b/coil3/src/commonMain/kotlin/com/skydoves/landscapist/coil3/LocalCoilProvider.kt
@@ -20,7 +20,7 @@ import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import coil3.ImageLoader
 import coil3.SingletonImageLoader
-import coil3.network.ktor2.KtorNetworkFetcherFactory
+import coil3.network.ktor3.KtorNetworkFetcherFactory
 
 /**
  * Local containing the preferred [ImageLoader] for providing the same instance

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ glide = "4.16.0"
 fresco = "3.2.0"
 coil = "2.7.0"
 coil3 = "3.0.0-alpha10"
-ktor = "2.3.12"
+ktor = "3.0.0-rc-1"
 palette = "3.1.0"
 hilt = "2.52"
 spotless = "6.21.0"

diff --git a/landscapist-animation/build.gradle.kts b/landscapist-animation/build.gradle.kts
@@ -16,7 +16,7 @@
 import com.github.skydoves.landscapist.Configuration
 
 plugins {
-  id("landscapist.library.compose.multiplatform")
+  id("landscapist.library.compose.multiplatformWasm")
   id("landscapist.spotless")
 }
 

diff --git a/landscapist-placeholder/build.gradle.kts b/landscapist-placeholder/build.gradle.kts
@@ -16,7 +16,7 @@
 import com.github.skydoves.landscapist.Configuration
 
 plugins {
-  id("landscapist.library.compose.multiplatform")
+  id("landscapist.library.compose.multiplatformWasm")
   id("landscapist.spotless")
 }
 

diff --git a/landscapist/build.gradle.kts b/landscapist/build.gradle.kts
@@ -17,7 +17,7 @@
 import com.github.skydoves.landscapist.Configuration
 
 plugins {
-  id("landscapist.library.compose.multiplatform")
+  id("landscapist.library.compose.multiplatformWasm")
   id("landscapist.spotless")
 }