Merge pull request #39 from lupuuss/release-2.3.0

Release 2.3.0
lupuuss · Aug 23, 2024 · 30eace6 · 30eace6
2 parents 64b7f8a + 42bd27c
commit 30eace6
Show file tree

Hide file tree

Showing 74 changed files with 740 additions and 429 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 </br>
 
 [![Gradle Plugin Portal Stable](https://img.shields.io/gradle-plugin-portal/v/dev.mokkery)](https://plugins.gradle.org/plugin/dev.mokkery)
-[![Kotlin](https://img.shields.io/badge/kotlin-2.0.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-2.0.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![GitHub](https://img.shields.io/github/license/lupuuss/Mokkery)](https://github.com/lupuuss/Mokkery/blob/main/LICENSE)
 [![Docs](https://img.shields.io/static/v1?label=api&message=reference&labelColor=gray&color=blueviolet&logo=gitbook&logoColor=white)](https://mokkery.dev/api_reference)
 

diff --git a/build-mokkery/build.gradle.kts b/build-mokkery/build.gradle.kts
@@ -6,6 +6,7 @@ dependencies {
     api(libs.kotlin.plugin)
     api(libs.buildconfig.plugin)
     api(libs.dokka.plugin)
+    api(libs.vanniktech.publish.plugin)
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
diff --git a/build-mokkery/src/main/kotlin/mokkery-coroutines.gradle.kts b/build-mokkery/src/main/kotlin/mokkery-coroutines.gradle.kts
@@ -1,11 +1,10 @@
 @file:Suppress("UNUSED_VARIABLE")
 
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 
 plugins {
-    id("mokkery-publish")
     kotlin("multiplatform")
 }
 

diff --git a/build-mokkery/src/main/kotlin/mokkery-multiplatform.gradle.kts b/build-mokkery/src/main/kotlin/mokkery-multiplatform.gradle.kts
@@ -1,11 +1,10 @@
 @file:Suppress("UNUSED_VARIABLE")
 
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 
 plugins {
-    id("mokkery-publish")
     kotlin("multiplatform")
 }
 
@@ -15,16 +14,6 @@ kotlin {
     @OptIn(ExperimentalKotlinGradlePluginApi::class)
     applyDefaultHierarchyTemplate {
         common {
-            group("coroutines") {
-                group("blocking") {
-                    withJvm()
-                    withNative()
-                }
-                group("jsShared") {
-                    withJs()
-                    withWasmJs()
-                }
-            }
             group("wasm") {
                 withWasmJs()
                 withWasmWasi()

diff --git a/build-mokkery/src/main/kotlin/mokkery-publish.gradle.kts b/build-mokkery/src/main/kotlin/mokkery-publish.gradle.kts
@@ -2,70 +2,40 @@ import MokkeryUrls.GitConnection
 import MokkeryUrls.GitDevConnection
 import MokkeryUrls.GitHttp
 import MokkeryUrls.Website
+import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
-    `maven-publish`
-    signing
+    id("com.vanniktech.maven.publish")
     id("org.jetbrains.dokka")
 }
 
-loadLocalProperties()
-
-signing {
-    // disables signing for publishToMavenLocal
-    setRequired { gradle.taskGraph.allTasks.any { it is PublishToMavenRepository } }
-    sign(publishing.publications)
-}
-
-val signingTasks = tasks.withType<Sign>()
-tasks.withType<AbstractPublishToMaven>().configureEach {
-    dependsOn(signingTasks)
-}
-
-val dokkaJar by tasks.registering(Jar::class) {
-    group = JavaBasePlugin.DOCUMENTATION_GROUP
-    archiveClassifier.set("javadoc")
-    from(tasks.getByName("dokkaGfm"))
-}
-
-publishing {
-
-    repositories {
-        maven {
-            name = "sonatype"
-            url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-            credentials {
-                username = extraString("ossrhUsername")
-                password = extraString("ossrhPassword")
+mavenPublishing {
+    coordinates(project.group.toString(), project.name, project.version.toString())
+    signAllPublications()
+    publishToMavenCentral(SonatypeHost.S01, automaticRelease = false)
+    pom {
+        name.set(project.name)
+        description.set(
+            "Mokkery is a mocking library for Kotlin Multiplatform, easy to use, boilerplate-free and compiler plugin driven."
+        )
+        url.set(Website)
+        licenses {
+            license {
+                name.set("The Apache Software License, Version 2.0")
+                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                distribution.set("repo")
             }
         }
-    }
-    publications.withType<MavenPublication> {
-        artifact(dokkaJar)
-        pom {
-            name.set(project.name)
-            description.set(
-                "Mokkery is a mocking library for Kotlin Multiplatform, easy to use, boilerplate-free and compiler plugin driven."
-            )
-            url.set(Website)
-            licenses {
-                license {
-                    name.set("The Apache Software License, Version 2.0")
-                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                    distribution.set("repo")
-                }
-            }
-            developers {
-                developer {
-                    id.set("lupuuss")
-                    name.set("lupuuss")
-                }
-            }
-            scm {
-                url.set(GitHttp)
-                connection.set(GitConnection)
-                developerConnection.set(GitDevConnection)
+        developers {
+            developer {
+                id.set("lupuuss")
+                name.set("lupuuss")
             }
         }
+        scm {
+            url.set(GitHttp)
+            connection.set(GitConnection)
+            developerConnection.set(GitDevConnection)
+        }
     }
-}
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
+import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
     alias(libs.plugins.dokka)

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
 # atomicfu warnings
-kotlin.native.ignoreIncorrectDependencies=true
+kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
 kotlin.native.ignoreDisabledTargets=true
 org.gradle.jvmargs=-Xmx3g
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,23 @@
 [versions]
-mokkery = "2.2.0"
-kotlin = "2.0.10"
+mokkery = "2.3.0"
+kotlin = "2.0.20"
 kotlinx-coroutines = "1.8.1"
 buildconfig = "4.0.4"
 google-autoservice = "1.0.1"
 atomicfu = "0.24.0"
 dokka = "1.9.20"
-poko = "0.16.0"
+poko = "0.17.0"
+vanniktech-publish-plugin = "0.29.0"
+objensis = "3.4"
+bytebuddy = "1.14.19"
 
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 poko = { id = "dev.drewhamilton.poko", version.ref = "poko" }
 
 [libraries]
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+vanniktech-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "vanniktech-publish-plugin" }
 
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
@@ -28,3 +32,6 @@ google-autoservice = { module = "com.google.auto.service:auto-service", version.
 google-autoservice-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "google-autoservice"}
 
 gradle-plugin-kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }
+
+objenesis = { module = "org.objenesis:objenesis", version.ref = "objensis" }
+bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }