Merge pull request #285 from icerockdev/develop

Release 0.17.4

Author: Alex009

.github/workflows/compilation-check.yml

@@ -18,6 +18,12 @@ jobs:
           java-version: 11
       - name: Plugin check
         run: ./gradlew -p resources-generator build publishToMavenLocal
+      - name: check android only build
+        run: ./gradlew clean && ./gradlew assembleDebug
+      - name: check jvm only build
+        run: ./gradlew clean && ./gradlew jvmJar
+      - name: check ios only build
+        run: ./gradlew clean && ./gradlew compileKotlinIosX64
       - name: Library check
         run: ./gradlew build publishToMavenLocal
       - name: Check custom samples
@@ -26,3 +32,15 @@ jobs:
         run: cd sample/ios-app && pod install
       - name: Check iOS
         run: cd sample/ios-app && set -o pipefail && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v2
+        if: ${{ always() }}
+        with:
+          report_paths: '**/build/test-results/**/TEST-*.xml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Archive reports
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: code-coverage-report
+          path: '**/build/reports/**/*'

.github/workflows/ui-tests-android-sample.yml

@@ -41,7 +41,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.17.3"
+        classpath "dev.icerock.moko:resources-generator:0.17.4"
     }
 }
 
@@ -58,7 +58,7 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.17.3")
+    commonMainApi("dev.icerock.moko:resources:0.17.4")
 }
 
 multiplatformResources {

README.md

@@ -1,5 +1,5 @@
 [versions]
-kotlinVersion = "1.5.21"
+kotlinVersion = "1.5.31"
 androidGradleVersion = "4.1.2"
 
 # kotlinx
@@ -25,13 +25,13 @@ testRunnerVersion = "1.3.0"
 testRulesVersion = "1.3.0"
 testExtJunitVersion = "1.1.2"
 testCoreVersion = "1.3.0"
-robolectricVersion = "4.5.1"
+robolectricVersion = "4.6"
 
 # moko
 mokoGraphicsVersion = "0.7.0"
 mokoParcelizeVersion = "0.7.1"
 mokoTestVersion = "0.4.1"
-mokoResourcesVersion = "0.17.3"
+mokoResourcesVersion = "0.17.4"
 
 [libraries]
 # kotlinx

gradle/libs.versions.toml

@@ -8,10 +8,6 @@ plugins {
 }
 
 android {
-    dexOptions {
-        javaMaxHeapSize = "2g"
-    }
-
     defaultConfig.vectorDrawables.useSupportLibrary = true
 
     buildTypes {

resources-build-logic/src/main/kotlin/android-app-convention.gradle.kts

@@ -21,6 +21,7 @@ kotlin {
     sourceSets {
         named("jvmMain") {
             dependencies {
+                api(projects.resources)
                 implementation(compose.desktop.currentOs)
             }
         }

resources-compose/build.gradle.kts

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.resources.compose
+
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import dev.icerock.moko.resources.FontResource
+
+fun FontResource.toComposeFont(
+    weight: FontWeight = FontWeight.Normal,
+    style: FontStyle = FontStyle.Normal
+): Font {
+    return androidx.compose.ui.text.platform.Font(
+        file = this.file,
+        weight = weight,
+        style = style
+    )
+}

resources-compose/src/jvmMain/kotlin/dev/icerock/moko/resources/compose/ComposeFont.kt

@@ -3,7 +3,7 @@
  */
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version ("1.5.21")
+    id("org.jetbrains.kotlin.jvm") version ("1.5.31")
     id("detekt-convention")
     id("publication-convention")
     id("com.gradle.plugin-publish") version ("0.15.0")

resources-generator/build.gradle.kts

@@ -23,6 +23,7 @@ import dev.icerock.gradle.utils.isDependsOn
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSet
+import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
@@ -147,9 +148,9 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
             target.logger.warn("MR file generation for iOS is not supported on your system!")
         }
 
-        val generationTasks = target.tasks.filterIsInstance<GenerateMultiplatformResourcesTask>()
-        generationTasks.filter { it != commonGenerationTask }
-            .forEach { it.dependsOn(commonGenerationTask) }
+        target.tasks.withType<GenerateMultiplatformResourcesTask>()
+            .matching { it != commonGenerationTask }
+            .configureEach { it.dependsOn(commonGenerationTask) }
     }
 
     private fun setupCommonGenerator(

resources-generator/src/main/kotlin/dev/icerock/gradle/MultiplatformResourcesPlugin.kt

@@ -8,14 +8,22 @@ import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.PropertySpec
+import com.squareup.kotlinpoet.STRING
 import com.squareup.kotlinpoet.TypeSpec
 import dev.icerock.gradle.MultiplatformResourcesPluginExtension
 import dev.icerock.gradle.generator.MRGenerator
 import dev.icerock.gradle.tasks.CopyFrameworkResourcesToAppEntryPointTask
 import dev.icerock.gradle.tasks.CopyFrameworkResourcesToAppTask
+import dev.icerock.gradle.utils.toEnumeration
+import org.apache.commons.codec.digest.DigestUtils
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.cocoapods.CocoapodsExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeCompilation
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
@@ -26,6 +34,7 @@ import org.jetbrains.kotlin.konan.file.zipDirAs
 import org.jetbrains.kotlin.library.impl.KotlinLibraryLayoutImpl
 import java.io.File
 import java.io.InputStream
+import java.io.SequenceInputStream
 import java.util.Properties
 import java.util.zip.ZipEntry
 import java.util.zip.ZipException
@@ -65,6 +74,21 @@ class AppleMRGenerator(
                 .delegate(CodeBlock.of("lazy { NSBundle.loadableBundle(\"$bundleIdentifier\") }"))
                 .build()
         )
+
+        mrClass.addProperty(
+            PropertySpec.builder("contentHash", STRING, KModifier.PRIVATE)
+                .initializer("%S", calculateResourcesHash())
+                .build()
+        )
+    }
+
+    private fun calculateResourcesHash(): String {
+        val inputStreams: List<InputStream> = resourcesGenerationDir.walkTopDown()
+            .filterNot { it.isDirectory }
+            .map { it.inputStream() }.toList()
+        val singleInputStream: InputStream = SequenceInputStream(inputStreams.toEnumeration())
+
+        return singleInputStream.use { DigestUtils.md5Hex(it) }
     }
 
     override fun getImports(): List<ClassName> = listOf(
@@ -172,7 +196,7 @@ class AppleMRGenerator(
 
                 if (framework.isStatic) {
                     val resourcesExtension =
-                        project.extensions.getByType(MultiplatformResourcesPluginExtension::class.java)
+                        project.extensions.getByType<MultiplatformResourcesPluginExtension>()
                     if (resourcesExtension.disableStaticFrameworkWarning.not()) {
                         project.logger.warn(
                             """
@@ -231,9 +255,14 @@ $linkTask produces static framework, Xcode should have Build Phase with copyFram
             "copyFrameworkResourcesToApp",
             CopyFrameworkResourcesToAppEntryPointTask::class.java
         )
+        val multiplatformExtension = project.extensions.getByType<KotlinMultiplatformExtension>()
+        xcodeTask.configurationMapper = (multiplatformExtension as? ExtensionAware)?.extensions
+            ?.findByType<CocoapodsExtension>()
+            ?.xcodeConfigurationToNativeBuildType
+            ?: emptyMap()
 
         if (framework.target.konanTarget == xcodeTask.konanTarget &&
-            framework.buildType.getName() == xcodeTask.configuration
+            framework.buildType.getName() == xcodeTask.configuration?.toLowerCase()
         ) {
             xcodeTask.dependsOn(copyTask)
         }