Initial Kotlin Multiplatform setup

assertions/build.gradle.kts

@@ -1,10 +1,27 @@
 plugins {
-    buildsrc.convention.`kotlin-jvm`
-    buildsrc.convention.`publish-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
+    buildsrc.convention.`publish-kmp`
 }
 
-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,7 +1,6 @@
 plugins {
-    buildsrc.convention.base
-    buildsrc.convention.`kotlin-jvm`
-    buildsrc.convention.`publish-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
+    buildsrc.convention.`publish-kmp`
 
     id("org.jetbrains.kotlinx.kover")
 
@@ -13,22 +12,30 @@ 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)
 }
 
 kover {
-    coverageEngine.set(kotlinx.kover.api.CoverageEngine.INTELLIJ)
+    intellijEngineVersion.set("1.0.680")
 }
 
 nexusPublishing {
@@ -38,6 +45,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.5.1"
 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.all {
+        compilations.all {
+            kotlinOptions {
+                apiVersion = "1.5"
+                languageVersion = "1.7"
+            }
+        }
+    }
+}

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

@@ -0,0 +1,7 @@
+package buildsrc.convention
+
+
+plugins {
+}
+
+// placeholder

dsl/build.gradle.kts

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

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-kmp`
 }
 
-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-kmp`
 }
 
-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)
+            }
+        }
+    }
 }

fetcher/base-fetcher/src/main/kotlin/it/skrape/fetcher/Cookie.kt → fetcher/base-fetcher/src/commonMain/kotlin/it/skrape/fetcher/Cookie.kt

@@ -54,16 +54,16 @@ public fun String.toCookie(origin: String): Cookie {
         else -> Domain(domainUrl, true)
     }
     val sameSite = attributes.getAttribute("samesite").toSameSite()
-    val secure = attributes.any { it.toLowerCase() == "secure" }
-    val httpOnly = attributes.any { it.toLowerCase() == "httponly" }
+    val secure = attributes.any { it.lowercase() == "secure" }
+    val httpOnly = attributes.any { it.lowercase() == "httponly" }
     return Cookie(name, value, expires, maxAge, domain, path, sameSite, secure, httpOnly)
 }
 
 private fun List<String>.getAttribute(attributeName: String) =
     this.find { it.startsWith("${attributeName}=", ignoreCase = true) }?.takeLastWhile { it != '=' }
 
 private fun String?.toSameSite(): SameSite {
-    return when (this?.toLowerCase()) {
+    return when (this?.lowercase()) {
         "strict" -> SameSite.STRICT
         "lax" -> SameSite.LAX
         "none" -> SameSite.NONE

fetcher/browser-fetcher/build.gradle.kts

@@ -1,16 +1,34 @@
 plugins {
-    buildsrc.convention.`kotlin-jvm`
+    buildsrc.convention.`kotlin-multiplatform`
 }
 
-dependencies {
-    api(projects.fetcher.baseFetcher)
-    api(Deps.htmlUnit) {
-        exclude("org.eclipse.jetty.websocket") // avoid android crash; see #93
-    }
-    val log4jOverSlf4jVersion = "1.7.36"
-    val logbackVersion = "1.2.11"
-    api("ch.qos.logback:logback-classic:$logbackVersion")
-    api("org.slf4j:log4j-over-slf4j:$log4jOverSlf4jVersion")
+kotlin {
+    jvm {}
+    sourceSets {
+
+        val commonMain by getting {
+            dependencies {
+                api(projects.fetcher.baseFetcher)
+            }
+        }
+
+        val jvmMain by getting {
+            dependencies {
+                api(Deps.htmlUnit) {
+                    exclude("org.eclipse.jetty.websocket") // avoid android crash; see #93
+                }
 
-    testImplementation(projects.testUtils)
+                val log4jOverSlf4jVersion = "1.7.36"
+                val logbackVersion = "1.2.11"
+                api("ch.qos.logback:logback-classic:$logbackVersion")
+                api("org.slf4j:log4j-over-slf4j:$log4jOverSlf4jVersion")
+            }
+        }
+
+        val jvmTest by getting {
+            dependencies {
+                implementation(projects.testUtils)
+            }
+        }
+    }
 }

fetcher/browser-fetcher/src/commonMain/kotlin/it/skrape/fetcher/BrowserFetcher.kt

@@ -0,0 +1,7 @@
+package it.skrape.fetcher
+
+public expect object BrowserFetcher : BlockingFetcher<Request> {
+
+    public fun render(html: String): String
+
+}

fetcher/browser-fetcher/src/main/kotlin/it/skrape/fetcher/BrowserFetcher.kt → fetcher/browser-fetcher/src/jvmMain/kotlin/it/skrape/fetcher/BrowserFetcher.kt

@@ -7,7 +7,7 @@ import com.gargoylesoftware.htmlunit.util.NameValuePair
 import java.net.Proxy
 import java.net.URL
 
-public object BrowserFetcher : BlockingFetcher<Request> {
+public actual object BrowserFetcher : BlockingFetcher<Request> {
     override val requestBuilder: Request get() = Request()
 
     override fun fetch(request: Request): Result {
@@ -41,7 +41,7 @@ public object BrowserFetcher : BlockingFetcher<Request> {
         return result
     }
 
-    public fun render(html: String): String =
+    public actual fun render(html: String): String =
         WebClient(BrowserVersion.BEST_SUPPORTED).loadHtmlCodeIntoCurrentWindow(html).asXml()
 
     private fun WebClient.withOptions(request: Request) = apply {