From 41c22994266c4f0dd474218595c31f23a14ce23f Mon Sep 17 00:00:00 2001
From: Masatoshi Kubode <swi.masatoshi@gmail.com>
Date: Tue, 23 Aug 2022 18:32:28 +0900
Subject: [PATCH 1/2] Fix an issue that Android libraries was not published

Fixes: https://github.com/mockk/mockk/issues/883
---
 .../buildsrc/convention/mockk-publishing.gradle.kts  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
index 20e9f1d6a..1cb83988b 100644
--- a/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
+++ b/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
@@ -64,13 +64,23 @@ publishing {
             }
         }*/
     }
+    // Configure for Android libraries
+    publications {
+        if (project.extensions.findByName("android") != null) {
+            register<MavenPublication>("release") {
+                afterEvaluate {
+                    from(components["release"])
+                }
+            }
+        }
+    }
     publications.withType<MavenPublication>().configureEach {
         createMockKPom {
             name.set(provider { mavenName })
             description.set(provider { mavenDescription })
         }
 
-        artifact(tasks.provider<Jar>("javadocJar"))
+        artifact(tasks.provider<Task>("javadocJar"))
 
         signing.sign(this)
     }

From 5d40bb29f1dd316d854b4a1791f0848eb1777223 Mon Sep 17 00:00:00 2001
From: Masatoshi Kubode <swi.masatoshi@gmail.com>
Date: Tue, 23 Aug 2022 18:48:29 +0900
Subject: [PATCH 2/2] Remove wrong `Jar` import

---
 .../main/kotlin/buildsrc/convention/android-library.gradle.kts  | 2 --
 .../main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts
index fd9e26055..3f3e573e7 100644
--- a/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts
+++ b/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts
@@ -1,7 +1,5 @@
 package buildsrc.convention
 
-import org.gradle.jvm.tasks.Jar
-
 plugins {
     id("com.android.library")
 
diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
index 1cb83988b..585bc265f 100644
--- a/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
+++ b/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
@@ -80,7 +80,7 @@ publishing {
             description.set(provider { mavenDescription })
         }
 
-        artifact(tasks.provider<Task>("javadocJar"))
+        artifact(tasks.provider<Jar>("javadocJar"))
 
         signing.sign(this)
     }