Merge pull request #458 from icerockdev/develop

Alex009 · web-flow · commit 4ed22eb45509 · 2023-04-12T15:43:25.000+06:00
Release 0.21.2
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.21.1"
+        classpath "dev.icerock.moko:resources-generator:0.21.2"
     }
 }
 
@@ -76,10 +76,10 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.21.1")
-    commonMainApi("dev.icerock.moko:resources-compose:0.21.1") // for compose multiplatform
+    commonMainApi("dev.icerock.moko:resources:0.21.2")
+    commonMainApi("dev.icerock.moko:resources-compose:0.21.2") // for compose multiplatform
 
-    commonTestImplementation("dev.icerock.moko:resources-test:0.21.1")
+    commonTestImplementation("dev.icerock.moko:resources-test:0.21.2")
 }
 
 multiplatformResources {
@@ -98,7 +98,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
 
 ```
 framework {
-    export("dev.icerock.moko:resources:0.21.1")
+    export("dev.icerock.moko:resources:0.21.2")
     export("dev.icerock.moko:graphics:0.9.0") // toUIColor here
 }
 ```
diff --git a/gradle/moko.versions.toml b/gradle/moko.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-resourcesVersion = "0.21.1"
+resourcesVersion = "0.21.2"
 
 [libraries]
 resources = { module = "dev.icerock.moko:resources", version.ref = "resourcesVersion" }
diff --git a/resources-compose/src/appleMain/kotlin/dev/icerock/moko/resources/compose/internal/CGImageRef+Skia.kt b/resources-compose/src/appleMain/kotlin/dev/icerock/moko/resources/compose/internal/CGImageRef+Skia.kt
@@ -8,23 +8,28 @@ import cnames.structs.CGColorSpace
 import cnames.structs.CGImage
 import kotlinx.cinterop.CPointed
 import kotlinx.cinterop.CPointer
+import kotlinx.cinterop.CValue
 import kotlinx.cinterop.readBytes
 import org.jetbrains.skia.ColorAlphaType
 import org.jetbrains.skia.ColorType
 import org.jetbrains.skia.Image
 import org.jetbrains.skia.ImageInfo
 import platform.CoreGraphics.CGBitmapContextCreate
 import platform.CoreGraphics.CGColorSpaceCreateDeviceRGB
+import platform.CoreGraphics.CGContextClearRect
 import platform.CoreGraphics.CGContextDrawImage
 import platform.CoreGraphics.CGContextRef
 import platform.CoreGraphics.CGContextRelease
+import platform.CoreGraphics.CGImageAlphaInfo
 import platform.CoreGraphics.CGImageGetHeight
 import platform.CoreGraphics.CGImageGetWidth
 import platform.CoreGraphics.CGImageRef
+import platform.CoreGraphics.CGRect
 import platform.CoreGraphics.CGRectMake
 import platform.posix.free
 import platform.posix.malloc
 import platform.posix.size_t
+import platform.posix.uint32_t
 
 internal fun CGImageRef.toSkiaImage(): Image {
     val cgImage: CPointer<CGImage> = this
@@ -36,30 +41,34 @@ internal fun CGImageRef.toSkiaImage(): Image {
     val bytesPerPixel: ULong = bitsPerPixel / bitsPerComponent
     val bytesPerRow: ULong = width * bytesPerPixel
     val bufferSize: ULong = width * height * bytesPerPixel
+    val bitmapInfo: uint32_t = CGImageAlphaInfo.kCGImageAlphaPremultipliedLast.value
+
+    check(bufferSize != 0UL) { "image can't be 0 bytes" }
+    check(width > 0UL) { "width should be more then 0 px ($width)" }
+    check(height > 0UL) { "height should be more then 0 px ($height)" }
 
     val data: CPointer<out CPointed> = malloc(bufferSize)
         ?: throw IllegalArgumentException("can't allocate memory for render bitmap of $cgImage")
 
+    val rect: CValue<CGRect> = CGRectMake(
+        x = 0.0,
+        y = 0.0,
+        width = width.toDouble(),
+        height = height.toDouble()
+    )
+
     val ctx: CGContextRef = CGBitmapContextCreate(
         data = data,
         width = width,
         height = height,
         bitsPerComponent = bitsPerComponent,
         bytesPerRow = bytesPerRow,
         space = space,
-        bitmapInfo = platform.CoreGraphics.CGImageAlphaInfo.kCGImageAlphaPremultipliedLast.value
+        bitmapInfo = bitmapInfo
     ) ?: throw IllegalArgumentException("can't create bitmap context for $cgImage")
 
-    CGContextDrawImage(
-        ctx,
-        rect = CGRectMake(
-            x = 0.0,
-            y = 0.0,
-            width = width.toDouble(),
-            height = height.toDouble()
-        ),
-        image = cgImage
-    )
+    CGContextClearRect(c = ctx, rect = rect)
+    CGContextDrawImage(c = ctx, rect = rect, image = cgImage)
 
     CGContextRelease(ctx)
 
diff --git a/resources-compose/src/iosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt b/resources-compose/src/iosMain/kotlin/dev/icerock/moko/resources/compose/ImageResource.kt
@@ -13,7 +13,6 @@ import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.compose.internal.toSkiaImage
 import org.jetbrains.skia.Image
 import platform.CoreGraphics.CGImageRef
-import platform.CoreGraphics.CGImageRelease
 import platform.UIKit.UIImage
 
 @Composable
@@ -27,8 +26,6 @@ actual fun painterResource(imageResource: ImageResource): Painter {
 
         val skiaImage: Image = cgImage.toSkiaImage()
 
-        CGImageRelease(cgImage)
-
         BitmapPainter(image = skiaImage.toComposeImageBitmap())
     }
 }
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/AndroidPluginLogic.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/AndroidPluginLogic.kt
@@ -10,7 +10,9 @@ import dev.icerock.gradle.generator.MRGenerator
 import dev.icerock.gradle.generator.ResourceGeneratorFeature
 import dev.icerock.gradle.generator.android.AndroidMRGenerator
 import dev.icerock.gradle.utils.isDependsOn
+import org.gradle.api.Action
 import org.gradle.api.Project
+import org.gradle.api.Task
 import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
@@ -52,11 +54,15 @@ internal class AndroidPluginLogic(
         project.tasks
             .matching { it.name.startsWith("package") && it.name.endsWith("Assets") }
             .configureEach { task ->
-                task.doFirst {
-                    val android = project.extensions.getByType<BaseExtension>()
-                    val assets = android.sourceSets.getByName("main").assets
-                    assets.setSrcDirs(assets.srcDirs)
-                }
+                // for gradle optimizations we should use anonymous object
+                @Suppress("ObjectLiteralToLambda")
+                task.doFirst(object : Action<Task> {
+                    override fun execute(t: Task) {
+                        val android = project.extensions.getByType<BaseExtension>()
+                        val assets = android.sourceSets.getByName("main").assets
+                        assets.setSrcDirs(assets.srcDirs)
+                    }
+                })
             }
     }
 
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleMRGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleMRGenerator.kt
@@ -16,6 +16,7 @@ import dev.icerock.gradle.tasks.CopyExecutableResourcesToApp
 import dev.icerock.gradle.tasks.CopyFrameworkResourcesToAppEntryPointTask
 import dev.icerock.gradle.tasks.CopyFrameworkResourcesToAppTask
 import dev.icerock.gradle.utils.calculateResourcesHash
+import dev.icerock.gradle.utils.dependsOnProcessResources
 import dev.icerock.gradle.utils.klibs
 import org.gradle.api.Action
 import org.gradle.api.Project
@@ -99,6 +100,8 @@ class AppleMRGenerator(
         setupFrameworkResources()
         setupTestsResources()
         setupFatFrameworkTasks()
+
+        dependsOnProcessResources(project, sourceSet, generationTask)
     }
 
     override fun beforeMRGeneration() {
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/common/CommonMRGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/common/CommonMRGenerator.kt
@@ -35,5 +35,11 @@ class CommonMRGenerator(
         }.configureEach {
             it.dependsOn(generationTask)
         }
+
+        project.tasks
+            .matching { it.name.startsWith("metadata") && it.name.endsWith("ProcessResources") }
+            .configureEach {
+                it.dependsOn(generationTask)
+            }
     }
 }
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/js/JsMRGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/js/JsMRGenerator.kt
@@ -11,10 +11,12 @@ import com.squareup.kotlinpoet.STRING
 import com.squareup.kotlinpoet.TypeSpec
 import dev.icerock.gradle.generator.MRGenerator
 import dev.icerock.gradle.utils.calculateResourcesHash
+import dev.icerock.gradle.utils.dependsOnProcessResources
 import dev.icerock.gradle.utils.klibs
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
@@ -87,6 +89,13 @@ class JsMRGenerator(
         }
         setupKLibResources(generationTask)
         setupResources()
+
+        // Declare task ':web-app:generateMRcommonMain' as an input of ':web-app:jsSourcesJar'.
+        project.tasks.withType<Jar>().configureEach {
+            it.dependsOn(generationTask)
+        }
+
+        dependsOnProcessResources(project, sourceSet, generationTask)
     }
 
     private fun setupKLibResources(generationTask: Task) {
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmMRGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmMRGenerator.kt
@@ -10,6 +10,7 @@ import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.STRING
 import com.squareup.kotlinpoet.TypeSpec
 import dev.icerock.gradle.generator.MRGenerator
+import dev.icerock.gradle.utils.dependsOnProcessResources
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.jvm.tasks.Jar
@@ -46,31 +47,39 @@ class JvmMRGenerator(
                 STRINGS_BUNDLE_PROPERTY_NAME,
                 STRING,
                 KModifier.PRIVATE
-            )
-                .initializer(CodeBlock.of("\"%L/%L\"", LOCALIZATION_DIR, "${flattenClassName}_$STRINGS_BUNDLE_NAME"))
-                .build()
+            ).initializer(
+                CodeBlock.of(
+                    "\"%L/%L\"",
+                    LOCALIZATION_DIR,
+                    "${flattenClassName}_$STRINGS_BUNDLE_NAME"
+                )
+            ).build()
         )
 
         mrClass.addProperty(
             PropertySpec.builder(
                 PLURALS_BUNDLE_PROPERTY_NAME,
                 STRING,
                 KModifier.PRIVATE
-            )
-                .initializer(CodeBlock.of("\"%L/%L\"", LOCALIZATION_DIR, "${flattenClassName}_$PLURALS_BUNDLE_NAME"))
-                .build()
+            ).initializer(
+                CodeBlock.of(
+                    "\"%L/%L\"",
+                    LOCALIZATION_DIR,
+                    "${flattenClassName}_$PLURALS_BUNDLE_NAME"
+                )
+            ).build()
         )
     }
 
     override fun apply(generationTask: Task, project: Project) {
-        project.tasks.apply {
-            withType<KotlinCompile>().all {
-                it.dependsOn(generationTask)
-            }
+        project.tasks.withType<KotlinCompile>().configureEach {
+            it.dependsOn(generationTask)
         }
         project.tasks.withType<Jar>().configureEach {
             it.exclude("MR/**")
+            it.dependsOn(generationTask)
         }
+        dependsOnProcessResources(project, sourceSet, generationTask)
     }
 
     companion object {
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/utils/ProcessResourcesUtils.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/utils/ProcessResourcesUtils.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle.utils
+
+import dev.icerock.gradle.generator.MRGenerator
+import org.gradle.api.Project
+import org.gradle.api.Task
+
+fun dependsOnProcessResources(project: Project, sourceSet: MRGenerator.SourceSet, task: Task) {
+    project.tasks
+        .matching { it.name == sourceSet.name.removeSuffix("Main") + "ProcessResources" }
+        .configureEach {
+            it.dependsOn(task)
+        }
+}
diff --git a/samples/resources-gallery/build.gradle.kts b/samples/resources-gallery/build.gradle.kts
@@ -28,6 +28,11 @@ subprojects {
                 minSdkVersion(16)
                 targetSdkVersion(33)
             }
+
+            compileOptions {
+                sourceCompatibility = JavaVersion.VERSION_11
+                targetCompatibility = JavaVersion.VERSION_11
+            }
         }
     }
 }
diff --git a/samples/resources-gallery/gradle/wrapper/gradle-wrapper.properties b/samples/resources-gallery/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/resources-gallery/settings.gradle.kts b/samples/resources-gallery/settings.gradle.kts
@@ -2,8 +2,6 @@
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
     repositories {
         mavenCentral()

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ buildscript {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`dependencies {`
`61`		`- classpath "dev.icerock.moko:resources-generator:0.21.1"`
	`61`	`+ classpath "dev.icerock.moko:resources-generator:0.21.2"`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`@@ -76,10 +76,10 @@ project build.gradle`
`76`	`76`	`apply plugin: "dev.icerock.mobile.multiplatform-resources"`
`77`	`77`
`78`	`78`	`dependencies {`
`79`		`- commonMainApi("dev.icerock.moko:resources:0.21.1")`
`80`		`- commonMainApi("dev.icerock.moko:resources-compose:0.21.1") // for compose multiplatform`
	`79`	`+ commonMainApi("dev.icerock.moko:resources:0.21.2")`
	`80`	`+ commonMainApi("dev.icerock.moko:resources-compose:0.21.2") // for compose multiplatform`
`81`	`81`
`82`		`- commonTestImplementation("dev.icerock.moko:resources-test:0.21.1")`
	`82`	`+ commonTestImplementation("dev.icerock.moko:resources-test:0.21.2")`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`multiplatformResources {`
@@ -98,7 +98,7 @@ should [add `export` declarations](https://kotlinlang.org/docs/multiplatform-bui
`98`	`98`
`99`	`99`	```
`100`	`100`	`framework {`
`101`		`- export("dev.icerock.moko:resources:0.21.1")`
	`101`	`+ export("dev.icerock.moko:resources:0.21.2")`
`102`	`102`	`export("dev.icerock.moko:graphics:0.9.0") // toUIColor here`
`103`	`103`	`}`
`104`	`104`	```
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import dev.icerock.moko.resources.ImageResource`
`13`	`13`	`import dev.icerock.moko.resources.compose.internal.toSkiaImage`
`14`	`14`	`import org.jetbrains.skia.Image`
`15`	`15`	`import platform.CoreGraphics.CGImageRef`
`16`		`-import platform.CoreGraphics.CGImageRelease`
`17`	`16`	`import platform.UIKit.UIImage`
`18`	`17`
`19`	`18`	`@Composable`
`@@ -27,8 +26,6 @@ actual fun painterResource(imageResource: ImageResource): Painter {`
`27`	`26`
`28`	`27`	`val skiaImage: Image = cgImage.toSkiaImage()`
`29`	`28`
`30`		`- CGImageRelease(cgImage)`
`31`		`-`
`32`	`29`	`BitmapPainter(image = skiaImage.toComposeImageBitmap())`
`33`	`30`	`}`
`34`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,11 @@ class CommonMRGenerator(`
`35`	`35`	`}.configureEach {`
`36`	`36`	`it.dependsOn(generationTask)`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ project.tasks`
	`40`	`+ .matching { it.name.startsWith("metadata") && it.name.endsWith("ProcessResources") }`
	`41`	`+ .configureEach {`
	`42`	`+ it.dependsOn(generationTask)`
	`43`	`+ }`
`38`	`44`	`}`
`39`	`45`	`}`