Merge pull request #111 from icerockdev/develop

Release 0.13.1
icerockdev · Sep 9, 2020 · 5f1cdce · 5f1cdce
2 parents 5d63224 + 4a9fee6
commit 5f1cdce
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -51,6 +51,7 @@ This is a Kotlin MultiPlatform library that provides access to the resources on
   - 0.12.0
 - kotlin 1.4.0
   - 0.13.0
+  - 0.13.1
 
 ## Installation
 root build.gradle  
@@ -61,7 +62,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "dev.icerock.moko:resources-generator:0.13.0"
+        classpath "dev.icerock.moko:resources-generator:0.13.1"
     }
 }
 
@@ -78,7 +79,7 @@ project build.gradle
 apply plugin: "dev.icerock.mobile.multiplatform-resources"
 
 dependencies {
-    commonMainApi("dev.icerock.moko:resources:0.13.0")
+    commonMainApi("dev.icerock.moko:resources:0.13.1")
 }
 
 multiplatformResources {

diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -19,7 +19,7 @@ object Deps {
 
     private const val mokoGraphicsVersion = "0.4.0"
     private const val mokoParcelizeVersion = "0.4.0"
-    const val mokoResourcesVersion = "0.13.0"
+    const val mokoResourcesVersion = "0.13.1"
 
     object Android {
         const val compileSdk = 28

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,6 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 android.useAndroidX=true
-android.enableJetifier=true
 
 # Workaround for Bintray treating .sha512 files as artifacts
 # https://github.com/gradle/gradle/issues/11412

diff --git a/...ources-generator/src/main/kotlin/dev/icerock/gradle/generator/common/CommonMRGenerator.kt b/...ources-generator/src/main/kotlin/dev/icerock/gradle/generator/common/CommonMRGenerator.kt
@@ -8,6 +8,7 @@ import com.squareup.kotlinpoet.KModifier
 import dev.icerock.gradle.generator.MRGenerator
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon
 import java.io.File
 
 class CommonMRGenerator(
@@ -23,6 +24,9 @@ class CommonMRGenerator(
 ) {
     override fun getMRClassModifiers(): Array<KModifier> = arrayOf(KModifier.EXPECT)
 
-    @Suppress("EmptyFunctionBlock")
-    override fun apply(generationTask: Task, project: Project) {}
+    override fun apply(generationTask: Task, project: Project) {
+        project.tasks
+            .matching { it is KotlinCompileCommon }
+            .configureEach { it.dependsOn(generationTask) }
+    }
 }
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -18,7 +18,7 @@ android {
 
 dependencies {
     commonMainApi(Deps.Libs.MultiPlatform.mokoResources)
-    mppLibrary(Deps.Libs.MultiPlatform.mokoGraphics)
+    commonMainApi(Deps.Libs.MultiPlatform.mokoGraphics.common)
 
 // disabled while not fixed https://youtrack.jetbrains.com/issue/KT-41384
 //    commonMainImplementation(project("$path:nested-module"))