Initial Kotlin Multiplatform setup

assertions/build.gradle.kts

@@ -1,10 +1,28 @@
 plugins {
-    buildsrc.convention.`kotlin-jvm`
-    buildsrc.convention.`publish-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
+    buildsrc.convention.kover
+    buildsrc.convention.`publish-kotlin-multiplatform`
 }
 
-dependencies {
-    api(projects.htmlParser)
-    api(projects.dsl)
-    api(projects.fetcher.baseFetcher)
+kotlin {
+    jvm {}
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(projects.htmlParser)
+                api(projects.dsl)
+                api(projects.fetcher.baseFetcher)
+            }
+        }
+
+        val jvmTest by getting {
+            dependencies {
+                implementation(Deps.jUnit)
+                implementation(Deps.strikt)
+                implementation(Deps.Mockk.mockk)
+                implementation(Deps.Mockk.dslJvm)
+            }
+        }
+    }
 }

assertions/src/main/kotlin/it/skrape/matchers/ContentTypeHeaderMatchers.kt → assertions/src/commonMain/kotlin/it/skrape/matchers/ContentTypeHeaderMatchers.kt

@@ -37,5 +37,5 @@ public infix fun ContentType.toContain(expected: ContentTypes): ContentType /* =
         this.apply { generalAssertion(raw().contains(expected.value), expected) }
 
 private fun ContentType.raw() = (this as String)
-        .toLowerCase()
+        .lowercase()
         .replace("\\s".toRegex(), "")

build.gradle.kts

@@ -1,9 +1,10 @@
+import kotlinx.kover.api.KoverNames
+
 plugins {
-    buildsrc.convention.base
-    buildsrc.convention.`kotlin-jvm`
-    buildsrc.convention.`publish-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
+    buildsrc.convention.`publish-kotlin-multiplatform`
 
-    id("org.jetbrains.kotlinx.kover")
+    buildsrc.convention.kover
 
     id("io.github.gradle-nexus.publish-plugin")
 }
@@ -13,22 +14,52 @@ val release_version: String by project
 version = release_version
 group = "it.skrape"
 
-dependencies {
-    api(projects.assertions)
-    api(projects.fetcher.asyncFetcher)
-    api(projects.fetcher.baseFetcher)
-    api(projects.fetcher.browserFetcher)
-    api(projects.dsl)
-    api(projects.fetcher.httpFetcher)
-    api(projects.htmlParser)
+kotlin {
+    jvm {}
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(projects.assertions)
+                api(projects.fetcher.asyncFetcher)
+                api(projects.fetcher.baseFetcher)
+                api(projects.fetcher.browserFetcher)
+                api(projects.dsl)
+                api(projects.fetcher.httpFetcher)
+                api(projects.htmlParser)
+            }
+        }
+    }
 }
 
 tasks.withType<Test>().configureEach {
-    finalizedBy(tasks.koverReport, tasks.koverCollectReports)
+    finalizedBy(tasks.koverReport)
+    // lazily access koverMergedReport task because it doesn't have a specific DSL accessor or type
+    val koverMergedReportTask = tasks.matching { it.name == KoverNames.MERGED_REPORT_TASK_NAME }
+    finalizedBy(koverMergedReportTask)
 }
 
-kover {
-    coverageEngine.set(kotlinx.kover.api.CoverageEngine.INTELLIJ)
+koverMerged {
+    enable()
+
+    filters {
+        projects {
+            excludes += listOf(
+                ":examples:scraping",
+                ":examples:use-pre-release-version",
+                ":fetcher:async-fetcher",
+                ":fetcher:base-fetcher",
+                ":fetcher:browser-fetcher",
+                ":fetcher:http-fetcher",
+
+                // Intermediate projects, without a build.gradle.kts.
+                // (These exclusions can be removed in a future Kover release https://github.com/Kotlin/kotlinx-kover/issues/222)
+                ":examples",
+                ":fetcher",
+                ":test-utils",
+            )
+        }
+    }
 }
 
 nexusPublishing {
@@ -38,6 +69,6 @@ nexusPublishing {
 }
 
 tasks.wrapper {
-    gradleVersion = "7.5"
+    gradleVersion = "7.5.1"
     distributionType = Wrapper.DistributionType.ALL
 }

buildSrc/build.gradle.kts

@@ -4,14 +4,14 @@ plugins {
 }
 
 // set the versions of Gradle plugins that the subprojects will use here
-val kotlinVersion = "1.6.21"
+val kotlinVersion = "1.7.10"
 
 val detektPlugin = "1.19.0"
 val gradleNexusPublishPlugin = "1.1.0"
 val gradleTestLoggerPlugin = "3.1.0"
 val gradleVersionsPlugin = "0.39.0"
-val kotlinDokkaPlugin = "1.6.21"
-val kotlinxKoverPlugin = "0.5.0"
+val kotlinDokkaPlugin = "1.7.10"
+val kotlinxKoverPlugin = "0.6.0"
 val useLatestVersionsPlugin = "0.2.18"
 
 dependencies {

buildSrc/src/main/kotlin/Deps.kt

@@ -1,7 +1,7 @@
 object Versions {
-    const val kotlin = "1.6.21"
+    const val kotlin = "1.7.10"
     const val coroutines = "1.6.1"
-    const val ktor = "2.0.3" //2.0.1
+    const val ktor = "2.0.3"
     const val serialization = "1.0.1"
     const val datetime = "0.1.1"
     const val jsoup = "1.13.1" // 1.14.3

buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
 kotlin {
     explicitApi()
     jvmToolchain {
-        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("8"))
+        languageVersion.set(JavaLanguageVersion.of("8"))
     }
 }
 
@@ -40,8 +40,8 @@ tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.apply {
         jvmTarget = "1.8"
         freeCompilerArgs += listOf("-Xjsr305=strict")
-        apiVersion = "1.4"
-        languageVersion = "1.4"
+        apiVersion = "1.5"
+        languageVersion = "1.7"
     }
 }
 

buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts

@@ -7,3 +7,16 @@ plugins {
     id("buildsrc.convention.base")
     id("buildsrc.convention.detekt")
 }
+
+kotlin {
+    explicitApi()
+
+    targets.configureEach {
+        compilations.configureEach {
+            kotlinOptions {
+                apiVersion = "1.5"
+                languageVersion = "1.7"
+            }
+        }
+    }
+}

buildSrc/src/main/kotlin/buildsrc/convention/kover.gradle.kts

@@ -0,0 +1,12 @@
+package buildsrc.convention
+
+import kotlinx.kover.api.IntellijEngine
+
+plugins {
+    id("org.jetbrains.kotlinx.kover")
+}
+
+kover {
+    // https://search.maven.org/artifact/org.jetbrains.intellij.deps/intellij-coverage-agent
+    engine.set(IntellijEngine("1.0.681"))
+}

buildSrc/src/main/kotlin/buildsrc/convention/publish-kotlin-multiplatform.gradle.kts

@@ -0,0 +1,56 @@
+package buildsrc.convention
+
+import buildsrc.config.createSkrapeItPom
+import gradle.kotlin.dsl.accessors._4ad077ad74816558e52d7069eb18a2f7.publishing
+import gradle.kotlin.dsl.accessors._4ad077ad74816558e52d7069eb18a2f7.signing
+import org.gradle.api.provider.Provider
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.maven
+import org.gradle.kotlin.dsl.provideDelegate
+
+plugins {
+    `maven-publish`
+    signing
+}
+
+description = "Configuration for publishing Kotlin Multiplatform libraries to Sonatype Maven Central"
+
+val signingKeyId: String? by project
+val signingKey: String? by project
+val signingPassword: String? by project
+
+val signingEnabled: Provider<Boolean> = provider {
+    signingKeyId != null && signingKey != null && signingPassword != null
+}
+
+val javadocJar by tasks.registering(Jar::class) {
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    description = "Empty Javadoc Jar (required by Maven Central)"
+    archiveClassifier.set("javadoc")
+}
+
+publishing {
+    repositories {
+        // publish to local dir, for testing
+        maven(rootProject.layout.buildDirectory.dir("maven-internal")) {
+            name = "LocalProjectDir"
+        }
+    }
+    publications.withType<MavenPublication>().configureEach {
+        artifact(javadocJar)
+
+        createSkrapeItPom {
+            name.set("skrape{it} ${project.name}")
+        }
+    }
+}
+
+signing {
+    if (signingEnabled.get()) {
+        sign(publishing.publications)
+
+        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+    }
+}

dsl/build.gradle.kts

@@ -1,4 +1,9 @@
 plugins {
-    buildsrc.convention.`kotlin-jvm`
-    buildsrc.convention.`publish-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
+
+    buildsrc.convention.kover
+}
+
+kotlin {
+    jvm {}
 }

examples/README.md

@@ -16,4 +16,4 @@ More specifically it searches a bunch [kotlinweekly newsletters](http://www.kotl
 ## Pre-Release version usage
 
 Need a new feature really urgent? 
-The [pre-release example](use-pre-release-version) show cases how to use jitpack releases directly taken from master commit even before official release to maven central has happened.
+The [pre-release example](use-pre-release-version) show cases how to use jitpack releases directly taken from master commit even before official release to maven central has happened.

fetcher/async-fetcher/build.gradle.kts

@@ -1,15 +1,32 @@
 plugins {
-    buildsrc.convention.`kotlin-jvm`
-    buildsrc.convention.`publish-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
+    buildsrc.convention.`publish-kotlin-multiplatform`
 }
 
-dependencies {
-    implementation(projects.fetcher.baseFetcher)
-    implementation(Deps.Ktor.client)
-    implementation(Deps.Ktor.clientApache)
-    implementation(Deps.Ktor.clientLogging)
-    implementation(Deps.logback)
-    implementation(Deps.log4jOverSlf4j)
+kotlin {
+    jvm {}
 
-    testImplementation(projects.testUtils)
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(projects.fetcher.baseFetcher)
+                implementation(Deps.Ktor.client)
+                implementation(Deps.Ktor.clientApache)
+                implementation(Deps.Ktor.clientLogging)
+            }
+        }
+
+        val jvmMain by getting {
+            dependencies {
+                implementation(Deps.logback)
+                implementation(Deps.log4jOverSlf4j)
+            }
+        }
+
+        val jvmTest by getting {
+            dependencies {
+                implementation(projects.testUtils)
+            }
+        }
+    }
 }

fetcher/async-fetcher/src/main/kotlin/it/skrape/fetcher/extensions.kt

@@ -88,7 +88,7 @@ internal fun String?.toExpires(): Expires {
     }
 }
 
-internal fun String?.toSameSite(): SameSite = when (this?.toLowerCase()) {
+internal fun String?.toSameSite(): SameSite = when (this?.lowercase()) {
     "strict" -> SameSite.STRICT
     "lax" -> SameSite.LAX
     "none" -> SameSite.NONE

fetcher/base-fetcher/build.gradle.kts

@@ -1,20 +1,36 @@
-@file:Suppress("PropertyName")
-
-val kotlin_version: String by project
-
 plugins {
-    buildsrc.convention.`kotlin-jvm`
-    buildsrc.convention.`publish-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
+    buildsrc.convention.`publish-kotlin-multiplatform`
 }
 
-dependencies {
-    implementation(projects.dsl)
-    implementation(Deps.Kotlin.reflect) {
-        because("to support Result#extractIt by creating instance of a class")
-    }
-    api(Deps.KotlinX.Coroutines.jdk8)
+kotlin {
+    jvm {}
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(projects.dsl)
+                api(Deps.KotlinX.Coroutines.core)
+            }
+        }
+
+        val jvmMain by getting {
+            dependencies {
+                api(Deps.jsoup)
+                implementation(Deps.Kotlin.reflect) {
+                    because("to support Result#extractIt by creating instance of a class")
+                }
+                api(Deps.KotlinX.Coroutines.jdk8)
+            }
+        }
 
-    testImplementation(projects.testUtils)
-    testImplementation(Deps.Ktor.client)
-    testImplementation(Deps.Ktor.clientApache)
+        val jvmTest by getting {
+
+            dependencies {
+                implementation(projects.testUtils)
+
+                implementation(Deps.Ktor.client)
+                implementation(Deps.Ktor.clientApache)
+            }
+        }
+    }
 }