Convert to multiplatform

build.gradle.kts

@@ -1,19 +1,3 @@
-apply {
-    from("https://raw.githubusercontent.com/ligi/gradle-common/master/versions_plugin_stable_only.gradle")
-}
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
-        classpath("com.github.ben-manes:gradle-versions-plugin:${Versions.versionsPlugin}")
-    }
-
-}
-
 allprojects {
 
     repositories {
@@ -23,39 +7,11 @@ allprojects {
 
 }
 
-
 subprojects {
     repositories {
         jcenter()
         maven("https://jitpack.io")
         maven("https://kotlin.bintray.com/kotlinx")
     }
-
-    apply(plugin = "jacoco")
-    apply(plugin = "maven")
-    apply(plugin = "kotlin")
-
-    tasks.withType<Test> {
-        useJUnitPlatform()
-    }
-
-    configure<JavaPluginExtension> {
-        withSourcesJar()
-        withJavadocJar()
-    }
-
-    afterEvaluate {
-
-        dependencies {
-            "implementation"("org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}")
-
-            "testImplementation"("org.assertj:assertj-core:3.14.0")
-            "testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.jupiter}")
-            "testRuntime"("org.junit.jupiter:junit-jupiter-engine:${Versions.jupiter}")
-
-            "testImplementation"("org.jetbrains.kotlin:kotlin-test")
-        }
-
-    }
 }
 

buildSrc/build.gradle.kts

@@ -1,15 +1,22 @@
 plugins {
     idea
     `kotlin-dsl`
+    `kotlin-dsl-precompiled-script-plugins`
 }
 
 repositories {
     gradlePluginPortal()
+    jcenter()
 }
 
 idea {
     module {
         isDownloadJavadoc = false
         isDownloadSources = false
     }
+}
+
+dependencies {
+    implementation(kotlin("gradle-plugin", "${property("kgp")}"))
+    implementation("com.github.ben-manes", "gradle-versions-plugin", "${property("plugin.com.github.ben-manes.versions")}")
 }

buildSrc/gradle.properties

@@ -0,0 +1 @@
+../gradle.properties

buildSrc/src/main/kotlin/Versions.kt

@@ -1,5 +1,4 @@
 object Versions {
-    const val kotlin = "1.3.61"
-    const val versionsPlugin = "0.27.0"
-    const val jupiter = "5.5.2"
+    const val jacocoPlugin = "0.8.5"
+    const val assertk = "0.23"
 }

buildSrc/src/main/kotlin/mpp-module.gradle.kts

@@ -0,0 +1,96 @@
+import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
+
+plugins {
+    kotlin("multiplatform")
+    id("java-library") // required for jacoco plugin
+    jacoco
+    id("com.github.ben-manes.versions")
+}
+
+kotlin {
+    targets {
+        jvm()
+        js(BOTH) {
+            nodejs {
+                testTask {
+                    useMocha {
+                        timeout = "5s"
+                    }
+                }
+            }
+        }
+    }
+    sourceSets {
+        commonTest {
+            dependencies {
+                implementation(kotlin("test-common"))
+                implementation(kotlin("test-annotations-common"))
+            }
+        }
+
+        val jvmTest by getting {
+            dependencies {
+                implementation(kotlin("test-junit"))
+            }
+        }
+
+        val jsTest by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+            }
+        }
+        all {
+            languageSettings.enableLanguageFeature("InlineClasses")
+        }
+    }
+}
+
+jacoco {
+    toolVersion = Versions.jacocoPlugin
+}
+
+tasks.withType<JacocoReport> {
+    dependsOn("jvmTest")
+    group = "Reporting"
+    description = "Generate Jacoco coverage reports."
+    val coverageSourceDirs = arrayOf(
+        "commonMain/src",
+        "jvmMain/src"
+    )
+    val classFiles = File("${buildDir}/classes/kotlin/jvm/")
+        .walkBottomUp()
+        .toSet()
+    classDirectories.setFrom(classFiles)
+    sourceDirectories.setFrom(files(coverageSourceDirs))
+    additionalSourceDirs.setFrom(files(coverageSourceDirs))
+
+    executionData
+        .setFrom(files("${buildDir}/jacoco/jvmTest.exec"))
+    reports {
+        xml.isEnabled = true
+        csv.isEnabled = false
+        html.isEnabled = true
+        html.destination =
+            File("${buildDir}/jacoco-reports/html")
+    }
+}
+
+/**
+ * The Gradle Versions Plugin is another Gradle plugin to discover dependency updates
+ * plugins.id("com.github.ben-manes.versions")
+ * Run it with $ ./gradlew --scan dependencyUpdates
+ * https://github.com/ben-manes/gradle-versions-plugin
+ * **/
+tasks.named("dependencyUpdates", DependencyUpdatesTask::class.java).configure {
+    fun isNonStable(version: String): Boolean {
+        val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+        val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+        val isStable = stableKeyword || regex.matches(version)
+        return isStable.not()
+    }
+
+    rejectVersionIf {
+        isNonStable(candidate.version)
+    }
+    checkConstraints = true
+}

core/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    id("mpp-module")
+}

core/src/test/kotlin/org/komputing/khex/TheHexFun.kt → core/src/commonTest/kotlin/org/komputing/khex/TheHexFun.kt

@@ -1,10 +1,6 @@
 package org.komputing.khex
 
-import org.junit.jupiter.api.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import kotlin.test.*
 
 class TheHexFun {
 

extensions/build.gradle.kts

@@ -1,3 +1,18 @@
-dependencies {
-    implementation(project(":core"))
+plugins {
+    id("mpp-module")
 }
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(project(":core"))
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation("com.willowtreeapps.assertk:assertk:${Versions.assertk}")
+            }
+        }
+    }
+}

extensions/src/test/kotlin/org/komputing/khex/extensions/HexStringExtensionsTests.kt → extensions/src/commonTest/kotlin/org/komputing/khex/extensions/HexStringExtensionsTests.kt

@@ -1,8 +1,12 @@
 package org.komputing.khex.extensions
 
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEmpty
+import assertk.assertions.isFalse
+import assertk.assertions.isTrue
 import org.komputing.khex.model.HexString
+import kotlin.test.Test
 import kotlin.test.assertEquals
 
 /**

gradle.properties

@@ -1,8 +1,33 @@
-# sytleguide
+# gradle.properties
+
+## Gradle Build Settings | jvmargs have been optimized for github Actions
+
+org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.jvmargs=-Xmx6g -XX:+UseG1GC
+org.gradle.parallel=true
+org.gradle.vfs.watch=true
+
+## Kotlin Build Settings
+
 kotlin.code.style=official
+kotlin.incremental=true
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.mpp.stability.nowarn=true
+kotlin.native.enableDependencyPropagation=false
+
+## Kapt Build Settings
+
+kapt.include.compile.classpath=false
+kapt.incremental.apt=true
+kapt.use.worker.api=true
+
+## Kotlin Gradle Plugin
+
+kgp=1.4.21
+
+## Kotlinx Version Definitions
 
-# gradle
-org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+kotlinx.coroutines=1.4.1
 
-org.gradle.parallel=true
+plugin.com.github.ben-manes.versions=0.36.0

gradle/wrapper/gradle-wrapper.properties

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