From e9065270025af2ac6f5ca3d96e89152a797edfd7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 18:23:23 +0000 Subject: [PATCH 01/16] Update agp to v8.2.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 662c1f4d..ebb7e4bf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.2.1" +agp = "8.2.2" compose-multiplatform = "1.6.0-dev1334" kotlin = "1.9.21" kotlinx-coroutines = "1.8.0-RC2" From 4532a58377657183f50693bb25e614f4154226b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 07:05:12 +0800 Subject: [PATCH 02/16] Update compose.multiplatform to v1.6.0-beta01 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ebb7e4bf..b274f5fa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.2.2" -compose-multiplatform = "1.6.0-dev1334" +compose-multiplatform = "1.6.0-beta01" kotlin = "1.9.21" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" From 2d409015c3f512041de7259372e17d4c6af0e240 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 12:05:55 +0800 Subject: [PATCH 03/16] Update kotlin monorepo to v1.9.22 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b274f5fa..984a71bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] agp = "8.2.2" compose-multiplatform = "1.6.0-beta01" -kotlin = "1.9.21" +kotlin = "1.9.22" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" androidx-core-ktx = "1.12.0" From c09f3186ba368e49a83fc578a04321eb9bd694b1 Mon Sep 17 00:00:00 2001 From: seiko Date: Fri, 26 Jan 2024 12:40:02 +0800 Subject: [PATCH 04/16] fix build --- app/common/build.gradle.kts | 5 ++++ .../kotlin/com/seiko/imageloader/demo/MR.kt | 4 ++- .../demo/scene/OtherImagesScene.kt | 2 +- .../{images => drawable}/car_black.svg | 0 .../composeRes/{images => drawable}/cat.jpg | Bin .../chat_from_bg_normal_9.png | Bin .../{images => drawable}/collection_logo.gif | Bin build.gradle.kts | 10 +++++++ .../fetcher/ComposeResourceFetcher.kt | 15 ++++++----- .../fetcher/MokoResourceFetcher.ios.kt | 1 + .../fetcher/MokoResourceFetcher.macos.kt | 1 + gradle/libs.versions.toml | 2 +- .../com/seiko/imageloader/Image.android.kt | 3 ++- .../component/mapper/ResourceUriMapper.kt | 2 ++ lint.xml | 25 ++++++++++++++++++ 15 files changed, 59 insertions(+), 11 deletions(-) rename app/common/src/commonMain/resources/composeRes/{images => drawable}/car_black.svg (100%) rename app/common/src/commonMain/resources/composeRes/{images => drawable}/cat.jpg (100%) rename app/common/src/commonMain/resources/composeRes/{images => drawable}/chat_from_bg_normal_9.png (100%) rename app/common/src/commonMain/resources/composeRes/{images => drawable}/collection_logo.gif (100%) create mode 100644 lint.xml diff --git a/app/common/build.gradle.kts b/app/common/build.gradle.kts index bf574850..0c5f458e 100644 --- a/app/common/build.gradle.kts +++ b/app/common/build.gradle.kts @@ -9,6 +9,11 @@ plugins { kotlin { sourceSets { + all { + languageSettings { + optIn("org.jetbrains.compose.resources.ExperimentalResourceApi") + } + } commonMain { dependencies { api(compose.runtime) 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 index 57950496..41551641 100644 --- a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/MR.kt +++ b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/MR.kt @@ -3,5 +3,7 @@ package com.seiko.imageloader.demo import io.github.qdsfdhvh.generated.resources.Res internal object MR { - val images get() = Res.images + val images get() = Res.drawable + + val colors get() = Res.drawable } 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 index 6b3433ac..f7dcd618 100644 --- 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 @@ -107,7 +107,7 @@ fun OtherImagesScene( } item { val imageBytes by produceState(null) { - value = readResourceBytes("composeRes/images/cat.jpg") + value = readResourceBytes("drawable/cat.jpg") } imageBytes?.let { ImageItem(it) diff --git a/app/common/src/commonMain/resources/composeRes/images/car_black.svg b/app/common/src/commonMain/resources/composeRes/drawable/car_black.svg similarity index 100% rename from app/common/src/commonMain/resources/composeRes/images/car_black.svg rename to app/common/src/commonMain/resources/composeRes/drawable/car_black.svg diff --git a/app/common/src/commonMain/resources/composeRes/images/cat.jpg b/app/common/src/commonMain/resources/composeRes/drawable/cat.jpg similarity index 100% rename from app/common/src/commonMain/resources/composeRes/images/cat.jpg rename to app/common/src/commonMain/resources/composeRes/drawable/cat.jpg diff --git a/app/common/src/commonMain/resources/composeRes/images/chat_from_bg_normal_9.png b/app/common/src/commonMain/resources/composeRes/drawable/chat_from_bg_normal_9.png similarity index 100% rename from app/common/src/commonMain/resources/composeRes/images/chat_from_bg_normal_9.png rename to app/common/src/commonMain/resources/composeRes/drawable/chat_from_bg_normal_9.png diff --git a/app/common/src/commonMain/resources/composeRes/images/collection_logo.gif b/app/common/src/commonMain/resources/composeRes/drawable/collection_logo.gif similarity index 100% rename from app/common/src/commonMain/resources/composeRes/images/collection_logo.gif rename to app/common/src/commonMain/resources/composeRes/drawable/collection_logo.gif diff --git a/build.gradle.kts b/build.gradle.kts index 67b27be0..2597ed6a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,6 +76,16 @@ allprojects { } } } + + // fix order of android release lint tasks + listOf( + "generateReleaseLintVitalModel", + "lintVitalAnalyzeRelease", + ).forEach { name -> + tasks.matching { it.name == name }.configureEach { + dependsOn(tasks.matching { it.name == "copyFontsToAndroidAssets" }) + } + } } tasks.dokkaHtmlMultiModule { diff --git a/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt b/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt index 3b640d0b..b6da3919 100644 --- a/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt +++ b/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt @@ -4,27 +4,28 @@ package com.seiko.imageloader.component.fetcher import com.seiko.imageloader.option.Options import okio.Buffer +import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi -import org.jetbrains.compose.resources.ImageResource import org.jetbrains.compose.resources.getPathByEnvironment +import org.jetbrains.compose.resources.getSystemEnvironment import org.jetbrains.compose.resources.readResourceBytes +@OptIn(ExperimentalResourceApi::class) class ComposeResourceFetcher { class Factory : Fetcher.Factory { override fun create(data: Any, options: Options): Fetcher? { - if (data is ImageResource) { - return ImageResourceFetcher(data) + if (data is DrawableResource) { + return DrawableResourceFetcher(data) } return null } } - private class ImageResourceFetcher( - private val resource: ImageResource, + private class DrawableResourceFetcher( + private val resource: DrawableResource, ) : Fetcher { - @OptIn(ExperimentalResourceApi::class) override suspend fun fetch(): FetchResult { - val path = resource.getPathByEnvironment() + val path = resource.getPathByEnvironment(getSystemEnvironment()) return FetchResult.OfSource( source = Buffer().apply { write(readResourceBytes(path)) diff --git a/extension/moko-resources/src/iosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.ios.kt b/extension/moko-resources/src/iosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.ios.kt index aea29635..fc4575f2 100644 --- a/extension/moko-resources/src/iosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.ios.kt +++ b/extension/moko-resources/src/iosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.ios.kt @@ -63,6 +63,7 @@ internal actual suspend fun FileResource.toFetchResult(options: Options): FetchR } @OptIn(ExperimentalForeignApi::class) +@Suppress("INVISIBLE_MEMBER") internal actual suspend fun ImageResource.toFetchResult(options: Options): FetchResult? { val uiImage: UIImage = this.toUIImage() ?: throw IllegalArgumentException("can't read UIImage of $this") diff --git a/extension/moko-resources/src/macosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.macos.kt b/extension/moko-resources/src/macosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.macos.kt index bd96e573..21e57bf1 100644 --- a/extension/moko-resources/src/macosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.macos.kt +++ b/extension/moko-resources/src/macosMain/kotlin/com/seiko/imageloader/component/fetcher/MokoResourceFetcher.macos.kt @@ -48,6 +48,7 @@ internal actual suspend fun FileResource.toFetchResult(options: Options): FetchR } @OptIn(ExperimentalForeignApi::class) +@Suppress("INVISIBLE_MEMBER") internal actual suspend fun ImageResource.toFetchResult(options: Options): FetchResult? { val nsImage: NSImage = this.toNSImage() ?: throw IllegalArgumentException("can't read NSImage of $this") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 984a71bc..c0e20852 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.2.2" -compose-multiplatform = "1.6.0-beta01" +compose-multiplatform = "1.6.0-dev1354" kotlin = "1.9.22" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" diff --git a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/Image.android.kt b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/Image.android.kt index fde3afea..04107050 100644 --- a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/Image.android.kt +++ b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/Image.android.kt @@ -9,6 +9,7 @@ import android.os.Looper import android.view.View import androidx.compose.runtime.RememberObserver import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.geometry.Size @@ -41,7 +42,7 @@ actual fun Image.toPainter(): Painter { private class DrawablePainter( val drawable: Drawable, ) : Painter(), RememberObserver { - private var drawInvalidateTick by mutableStateOf(0) + private var drawInvalidateTick by mutableIntStateOf(0) private var drawableIntrinsicSize by mutableStateOf(drawable.intrinsicSize) private val callback: Drawable.Callback by lazy { diff --git a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceUriMapper.kt b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceUriMapper.kt index 1a12b8fc..33913ac9 100644 --- a/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceUriMapper.kt +++ b/image-loader/src/androidMain/kotlin/com/seiko/imageloader/component/mapper/ResourceUriMapper.kt @@ -1,5 +1,6 @@ package com.seiko.imageloader.component.mapper +import android.annotation.SuppressLint import android.content.ContentResolver.SCHEME_ANDROID_RESOURCE import android.content.Context import com.eygraber.uri.Uri @@ -15,6 +16,7 @@ class ResourceUriMapper( private val context: Context? = null, ) : Mapper { + @SuppressLint("DiscouragedApi") override fun map(data: Any, options: Options): Uri? { if (data !is Uri) return null if (!isApplicable(data)) return null diff --git a/lint.xml b/lint.xml new file mode 100644 index 00000000..b4c0c36c --- /dev/null +++ b/lint.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + From 06a96eb5512b19c4a039b08ac1d7eca5f3f0b69e Mon Sep 17 00:00:00 2001 From: seiko Date: Fri, 26 Jan 2024 12:40:19 +0800 Subject: [PATCH 05/16] asdf java zulu-17.46.19 --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 5b67d2a8..86755c8c 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -java zulu-17.40.19 \ No newline at end of file +java zulu-17.46.19 From 081965d7d0d28e30de083918ca7d7004ee515b1f Mon Sep 17 00:00:00 2001 From: seiko Date: Fri, 26 Jan 2024 13:36:54 +0800 Subject: [PATCH 06/16] compose-multiplatform to v1.6.0-beta01 --- .../drawable/car_black.svg | 0 .../drawable/cat.jpg | Bin .../drawable/chat_from_bg_normal_9.png | Bin .../drawable/collection_logo.gif | Bin .../kotlin/com/seiko/imageloader/demo/MR.kt | 2 +- .../com/seiko/imageloader/demo/scene/Common.kt | 4 ++-- .../imageloader/demo/scene/OtherImagesScene.kt | 3 ++- .../resources/{composeRes => }/colors/colors.xml | 0 .../component/fetcher/ComposeResourceFetcher.kt | 2 ++ gradle/libs.versions.toml | 2 +- 10 files changed, 8 insertions(+), 5 deletions(-) rename app/common/src/commonMain/{resources/composeRes => composeResources}/drawable/car_black.svg (100%) rename app/common/src/commonMain/{resources/composeRes => composeResources}/drawable/cat.jpg (100%) rename app/common/src/commonMain/{resources/composeRes => composeResources}/drawable/chat_from_bg_normal_9.png (100%) rename app/common/src/commonMain/{resources/composeRes => composeResources}/drawable/collection_logo.gif (100%) rename app/common/src/commonMain/resources/{composeRes => }/colors/colors.xml (100%) diff --git a/app/common/src/commonMain/resources/composeRes/drawable/car_black.svg b/app/common/src/commonMain/composeResources/drawable/car_black.svg similarity index 100% rename from app/common/src/commonMain/resources/composeRes/drawable/car_black.svg rename to app/common/src/commonMain/composeResources/drawable/car_black.svg diff --git a/app/common/src/commonMain/resources/composeRes/drawable/cat.jpg b/app/common/src/commonMain/composeResources/drawable/cat.jpg similarity index 100% rename from app/common/src/commonMain/resources/composeRes/drawable/cat.jpg rename to app/common/src/commonMain/composeResources/drawable/cat.jpg diff --git a/app/common/src/commonMain/resources/composeRes/drawable/chat_from_bg_normal_9.png b/app/common/src/commonMain/composeResources/drawable/chat_from_bg_normal_9.png similarity index 100% rename from app/common/src/commonMain/resources/composeRes/drawable/chat_from_bg_normal_9.png rename to app/common/src/commonMain/composeResources/drawable/chat_from_bg_normal_9.png diff --git a/app/common/src/commonMain/resources/composeRes/drawable/collection_logo.gif b/app/common/src/commonMain/composeResources/drawable/collection_logo.gif similarity index 100% rename from app/common/src/commonMain/resources/composeRes/drawable/collection_logo.gif rename to app/common/src/commonMain/composeResources/drawable/collection_logo.gif 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 index 41551641..47612cd2 100644 --- 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.generated.resources.Res +import io.github.qdsfdhvh.common.generated.resources.Res internal object MR { val images get() = Res.drawable diff --git a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/Common.kt b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/Common.kt index 74591bbe..d338ae53 100644 --- a/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/Common.kt +++ b/app/common/src/commonMain/kotlin/com/seiko/imageloader/demo/scene/Common.kt @@ -12,7 +12,7 @@ import androidx.compose.material.Scaffold import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.derivedStateOf @@ -38,7 +38,7 @@ import kotlinx.coroutines.withContext @Composable fun BackButton(onBack: () -> Unit) { IconButton(onBack) { - Icon(Icons.Default.ArrowBack, "back") + Icon(Icons.AutoMirrored.Filled.ArrowBack, "back") } } 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 index f7dcd618..45a74316 100644 --- 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 @@ -29,9 +29,10 @@ import co.touchlab.kermit.Logger import com.seiko.imageloader.demo.data.imageJsonData import com.seiko.imageloader.rememberImagePainter import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.InternalResourceApi import org.jetbrains.compose.resources.readResourceBytes -@OptIn(ExperimentalResourceApi::class) +@OptIn(ExperimentalResourceApi::class, InternalResourceApi::class) @Composable fun OtherImagesScene( onBack: () -> Unit, diff --git a/app/common/src/commonMain/resources/composeRes/colors/colors.xml b/app/common/src/commonMain/resources/colors/colors.xml similarity index 100% rename from app/common/src/commonMain/resources/composeRes/colors/colors.xml rename to app/common/src/commonMain/resources/colors/colors.xml diff --git a/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt b/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt index b6da3919..8326aed6 100644 --- a/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt +++ b/extension/compose-resources/src/commonMain/kotlin/com/seiko/imageloader/component/fetcher/ComposeResourceFetcher.kt @@ -6,6 +6,7 @@ import com.seiko.imageloader.option.Options import okio.Buffer import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.InternalResourceApi import org.jetbrains.compose.resources.getPathByEnvironment import org.jetbrains.compose.resources.getSystemEnvironment import org.jetbrains.compose.resources.readResourceBytes @@ -24,6 +25,7 @@ class ComposeResourceFetcher { private class DrawableResourceFetcher( private val resource: DrawableResource, ) : Fetcher { + @OptIn(InternalResourceApi::class) override suspend fun fetch(): FetchResult { val path = resource.getPathByEnvironment(getSystemEnvironment()) return FetchResult.OfSource( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c0e20852..984a71bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.2.2" -compose-multiplatform = "1.6.0-dev1354" +compose-multiplatform = "1.6.0-beta01" kotlin = "1.9.22" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" From 07eacbc361d0012fa61394352e2123c988b604dd Mon Sep 17 00:00:00 2001 From: seiko Date: Tue, 6 Feb 2024 10:29:26 +0800 Subject: [PATCH 07/16] rm .tool-versions --- .tool-versions | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 86755c8c..00000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -java zulu-17.46.19 From f1c4af78d8ed71b4b4323d6f782359cb92dfba0f Mon Sep 17 00:00:00 2001 From: seiko Date: Tue, 6 Feb 2024 10:30:20 +0800 Subject: [PATCH 08/16] compose-multiplatform to 1.6.0-beta02 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 984a71bc..30564104 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.2.2" -compose-multiplatform = "1.6.0-beta01" +compose-multiplatform = "1.6.0-beta02" kotlin = "1.9.22" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" From 14792b1a827424a1c08b4198f24ed2e81e2b10aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 22:31:40 +0000 Subject: [PATCH 09/16] Update dependency com.squareup.okio:okio to v3.8.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be6ec332..706134d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ ktlint = "0.50.0" publish = "0.27.0" dokka = "1.9.10" ktor = "2.3.8" -okio = "3.7.0" +okio = "3.8.0" uri-kmp = "0.0.16" kermit = "2.0.3" androidsvg = "1.4" From 90fe5f7fb07eeb475f40244f8758afae40d854ff Mon Sep 17 00:00:00 2001 From: seiko Date: Sun, 11 Feb 2024 10:23:03 +0800 Subject: [PATCH 10/16] use jetbrains collection --- gradle/libs.versions.toml | 3 +-- image-loader/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 771f6da0..184d51f1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,6 @@ kotlin = "1.9.22" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" androidx-core-ktx = "1.12.0" -androidx-collection = "1.4.0" androidx-appcompat = "1.6.1" androidx-exifinterface = "1.3.7" androidx-activity-compose = "1.8.2" @@ -59,7 +58,6 @@ kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines- kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" } -androidx-collection = { module = "androidx.collection:collection", version.ref = "androidx-collection" } androidx-appcompat = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appcompat" } androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "androidx-exifinterface" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } @@ -90,6 +88,7 @@ ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "kto ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" } +jetbrains-collection = { module = "org.jetbrains.compose.collection-internal:collection", version.ref = "compose-multiplatform" } uri-kmp = { module = "com.eygraber:uri-kmp", version.ref = "uri-kmp" } kermit = { module = "co.touchlab:kermit", version.ref = "kermit" } androidsvg = { module = "com.caverock:androidsvg-aar", version.ref = "androidsvg" } diff --git a/image-loader/build.gradle.kts b/image-loader/build.gradle.kts index 7c609e85..51ade100 100644 --- a/image-loader/build.gradle.kts +++ b/image-loader/build.gradle.kts @@ -72,7 +72,7 @@ kotlin { jvmMain.get().dependsOn(this) appleMain.get().dependsOn(this) dependencies { - implementation(libs.androidx.collection) + implementation(libs.jetbrains.collection) } } } From 3fccf3af26c3e5145ab81fe6da8a39bc71074182 Mon Sep 17 00:00:00 2001 From: seiko Date: Mon, 12 Feb 2024 17:40:01 +0800 Subject: [PATCH 11/16] update compose resources config --- app/common/gradle.properties | 2 ++ gradle.properties | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 app/common/gradle.properties diff --git a/app/common/gradle.properties b/app/common/gradle.properties new file mode 100644 index 00000000..d2529bc5 --- /dev/null +++ b/app/common/gradle.properties @@ -0,0 +1,2 @@ +# https://github.com/JetBrains/compose-multiplatform/pull/3961 +compose.resources.always.generate.accessors=true diff --git a/gradle.properties b/gradle.properties index 7c7ba57b..fda6be35 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,5 +20,3 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true -# https://github.com/JetBrains/compose-multiplatform/pull/3961 -compose.resources.always.generate.accessors=true From ecde1a1e3d60cb6df27b01763d45d0fe1171ed0a Mon Sep 17 00:00:00 2001 From: seiko Date: Mon, 12 Feb 2024 17:40:04 +0800 Subject: [PATCH 12/16] Revert "use jetbrains collection" This reverts commit 90fe5f7fb07eeb475f40244f8758afae40d854ff. --- gradle/libs.versions.toml | 3 ++- image-loader/build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 184d51f1..771f6da0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ kotlin = "1.9.22" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" androidx-core-ktx = "1.12.0" +androidx-collection = "1.4.0" androidx-appcompat = "1.6.1" androidx-exifinterface = "1.3.7" androidx-activity-compose = "1.8.2" @@ -58,6 +59,7 @@ kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines- kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" } +androidx-collection = { module = "androidx.collection:collection", version.ref = "androidx-collection" } androidx-appcompat = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appcompat" } androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "androidx-exifinterface" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } @@ -88,7 +90,6 @@ ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "kto ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" } -jetbrains-collection = { module = "org.jetbrains.compose.collection-internal:collection", version.ref = "compose-multiplatform" } uri-kmp = { module = "com.eygraber:uri-kmp", version.ref = "uri-kmp" } kermit = { module = "co.touchlab:kermit", version.ref = "kermit" } androidsvg = { module = "com.caverock:androidsvg-aar", version.ref = "androidsvg" } diff --git a/image-loader/build.gradle.kts b/image-loader/build.gradle.kts index 51ade100..7c609e85 100644 --- a/image-loader/build.gradle.kts +++ b/image-loader/build.gradle.kts @@ -72,7 +72,7 @@ kotlin { jvmMain.get().dependsOn(this) appleMain.get().dependsOn(this) dependencies { - implementation(libs.jetbrains.collection) + implementation(libs.androidx.collection) } } } From 65be6242f157c1c94fe77f8cf27bddcb3a012d33 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 21:50:45 +0000 Subject: [PATCH 13/16] Update gradle/gradle-build-action action to v3.1.0 --- .github/workflows/CompareScreenshot.yml | 2 +- .github/workflows/StoreScreenshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CompareScreenshot.yml b/.github/workflows/CompareScreenshot.yml index 06e0ab7a..964fadfc 100644 --- a/.github/workflows/CompareScreenshot.yml +++ b/.github/workflows/CompareScreenshot.yml @@ -30,7 +30,7 @@ jobs: java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0 + uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0 with: gradle-version: wrapper diff --git a/.github/workflows/StoreScreenshot.yml b/.github/workflows/StoreScreenshot.yml index 0b22a5cd..7e6d9a9e 100644 --- a/.github/workflows/StoreScreenshot.yml +++ b/.github/workflows/StoreScreenshot.yml @@ -33,7 +33,7 @@ jobs: # Better than caching and/or extensions of actions/setup-java - name: Setup Gradle - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0 + uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0 with: gradle-version: wrapper From 4438a4210d9c57b73e392c7efd24f68630633b59 Mon Sep 17 00:00:00 2001 From: seiko Date: Wed, 14 Feb 2024 14:25:26 +0800 Subject: [PATCH 14/16] compose-multiplatform to 1.6.0-rc01 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 771f6da0..6cb3f424 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.2.2" -compose-multiplatform = "1.6.0-beta02" +compose-multiplatform = "1.6.0-rc01" kotlin = "1.9.22" kotlinx-coroutines = "1.8.0-RC2" kotlinx-serialization = "1.6.2" From ee65995804a0b5fca1c5542a0db65809d3bc3421 Mon Sep 17 00:00:00 2001 From: seiko Date: Wed, 14 Feb 2024 17:10:45 +0800 Subject: [PATCH 15/16] version to 1.7.5 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 678addc3..a4e49dbe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -101,7 +101,7 @@ object ProjectVersion { private const val monir = "7" // backwards compatible bug fixes - private const val path = "4" + private const val path = "5" const val version = "$major.$monir.$path" } From d06a6d9d1518093414fe86460413548b57006fb4 Mon Sep 17 00:00:00 2001 From: seiko Date: Wed, 14 Feb 2024 17:11:19 +0800 Subject: [PATCH 16/16] update docs --- README.md | 8 ++++---- docs/docs/setup.mdx | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b2a4ff5c..3008531d 100644 --- a/README.md +++ b/README.md @@ -17,17 +17,17 @@ kotlin { sourceSets { val commonMain by getting { dependencies { -+ api("io.github.qdsfdhvh:image-loader:1.7.4") ++ api("io.github.qdsfdhvh:image-loader:1.7.5") // optional - Moko Resources Decoder -+ api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.7.4") ++ api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.7.5") // optional - Blur Interceptor (only support bitmap) -+ api("io.github.qdsfdhvh:image-loader-extension-blur:1.7.4") ++ api("io.github.qdsfdhvh:image-loader-extension-blur:1.7.5") } } val jvmMain by getting { dependencies { // optional - ImageIO Decoder -+ api("io.github.qdsfdhvh:image-loader-extension-imageio:1.7.4") ++ api("io.github.qdsfdhvh:image-loader-extension-imageio:1.7.5") } } } diff --git a/docs/docs/setup.mdx b/docs/docs/setup.mdx index 3cfd7d38..4ac9d651 100644 --- 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.7.4") ++ api("io.github.qdsfdhvh:image-loader:1.7.5") // optional - Moko Resources Decoder -+ api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.7.4") ++ api("io.github.qdsfdhvh:image-loader-extension-moko-resources:1.7.5") // optional - Blur Interceptor (only support bitmap) -+ api("io.github.qdsfdhvh:image-loader-extension-blur:1.7.4") ++ api("io.github.qdsfdhvh:image-loader-extension-blur:1.7.5") } } val jvmMain by getting { dependencies { // optional - ImageIO Decoder -+ api("io.github.qdsfdhvh:image-loader-extension-imageio:1.7.4") ++ api("io.github.qdsfdhvh:image-loader-extension-imageio:1.7.5") } } } @@ -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.7.4" +image-loader = "1.7.5" [libraries] image-loader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "image-loader" }