Merge pull request #48 from icerockdev/develop

Release 0.11.0

Author: Alex009

README.md

@@ -1,5 +1,5 @@
 ![mobile-multiplatform](https://user-images.githubusercontent.com/5010169/100611874-9aa17f80-3344-11eb-9737-c50ba63b0f6e.png)  
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock/mobile-multiplatform) ](https://repo1.maven.org/maven2/dev/icerock/mobile-multiplatform) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.31-orange)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock/mobile-multiplatform) ](https://repo1.maven.org/maven2/dev/icerock/mobile-multiplatform)
 
 # Mobile Multiplatform gradle plugin
 This is a Gradle plugin for simple setup of Kotlin Multiplatform mobile Gradle modules.  
@@ -13,8 +13,8 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.10.1")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
+    implementation("dev.icerock:mobile-multiplatform:0.11.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
     implementation("com.android.tools.build:gradle:4.1.1")
 }
 ```
@@ -64,6 +64,8 @@ framework {
     export(kotlinNativeExportable = MultiPlatfomLibrary(<...>))
     export(kotlinNativeExportable = MultiPlatfomModule(<...>))
     export(arm64Dependency = "my.group:name-iosarm64:0.1.0", x64Dependency = "my.group:name-iosx64:0.1.0")
+    export(artifact = "my.group:name:0.1.0") // common artifact
+    export(provider = libs.myLib) // gradle 7 version catalog libraries accessors
 }
 ```
 

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "dev.icerock"
-version = "0.10.1"
+version = "0.11.0"
 
 repositories {
     mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/dev/icerock/gradle/FrameworkConfig.kt

@@ -6,6 +6,8 @@ package dev.icerock.gradle
 
 import KotlinNativeExportable
 import org.gradle.api.Project
+import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.konan.target.Architecture
 
@@ -33,6 +35,18 @@ open class FrameworkConfig {
         ).let { exports.add(it) }
     }
 
+    fun export(artifact: String) {
+        ExportDeclaration.ArtifactStringExport(
+            artifact = artifact
+        ).let { exports.add(it) }
+    }
+
+    fun export(provider: Provider<MinimalExternalModuleDependency>) {
+        ExportDeclaration.VersionCatalogExport(
+            provider = provider
+        ).let { exports.add(it) }
+    }
+
     internal sealed class ExportDeclaration {
         data class ExternalExport(
             val arm64: String,
@@ -64,6 +78,22 @@ open class FrameworkConfig {
             }
         }
 
+        data class ArtifactStringExport(
+            val artifact: String
+        ) : ExportDeclaration() {
+            override fun export(project: Project, framework: Framework) {
+                framework.export(this.artifact)
+            }
+        }
+
+        data class VersionCatalogExport(
+            val provider: Provider<MinimalExternalModuleDependency>
+        ) : ExportDeclaration() {
+            override fun export(project: Project, framework: Framework) {
+                framework.export(this.provider.get())
+            }
+        }
+
         abstract fun export(project: Project, framework: Framework)
     }
 }