Merge pull request #85 from akuleshov7/hotfix/release-hotfix

Hotfixing the module file of ktoml-file in build.gradle to fix KotlinJS

buildSrc/src/main/kotlin/com/akuleshov7/buildutils/PublishingConfiguration.kt

@@ -56,7 +56,7 @@ fun Project.configurePublishing() {
     // https://kotlinlang.org/docs/mpp-publish-lib.html#avoid-duplicate-publications
     // `configureNexusPublishing` adds sonatype publication tasks inside `afterEvaluate`.
     afterEvaluate {
-        val publicationsFromMainHost = listOf("jvm", "js", "linuxX64", "kotlinMultiplatform", "metadata")
+        val publicationsFromMainHost = listOf("jvm", "js", "linuxX64", "mingwX64", "kotlinMultiplatform", "metadata")
         configure<PublishingExtension> {
             publications.matching { it.name in publicationsFromMainHost }.all {
                 val targetPublication = this@all

detekt.yml

@@ -2,3 +2,19 @@
 potential-bugs:
   Deprecation:
     active: true
+
+formatting:
+  MaximumLineLength:
+    active: false
+    maxLineLength: 180
+
+style:
+  MaxLineLength:
+    active: true
+    maxLineLength: 180
+  # wildcards are used all over the project
+  WildcardImport:
+    active: false
+  # code is not stable yet, TODOs are still needed
+  ForbiddenComment:
+    active: false

ktoml-core/build.gradle.kts

@@ -25,14 +25,9 @@ kotlin {
         }
     }
 
-    val os = getCurrentOperatingSystem()
-
-    when {
-        os.isWindows -> mingwX64()
-        os.isLinux -> linuxX64()
-        os.isMacOsX -> macosX64()
-        else -> throw GradleException("Unknown operating system $os")
-    }
+    mingwX64()
+    linuxX64()
+    macosX64()
 
     sourceSets {
         all {

ktoml-file/build.gradle.kts

@@ -18,21 +18,30 @@ kotlin {
         }
     }
 
-    val os = getCurrentOperatingSystem()
-
-    val target = listOf(when {
-        os.isWindows -> mingwX64()
-        os.isLinux -> linuxX64()
-        os.isMacOsX -> macosX64()
-        else -> throw GradleException("Unknown operating system $os")
-    })
+    mingwX64()
+    linuxX64()
+    macosX64()
 
     sourceSets {
         all {
             languageSettings.optIn("kotlin.RequiresOptIn")
         }
 
-         val nativeMain by creating {
+        val linuxX64Main by getting {
+            dependencies {
+                implementation("com.squareup.okio:okio:${Versions.OKIO}")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.KOTLIN}")
+            }
+        }
+
+        val mingwX64Main by getting {
+            dependencies {
+                implementation("com.squareup.okio:okio:${Versions.OKIO}")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.KOTLIN}")
+            }
+        }
+
+        val macosX64Main by getting {
             dependencies {
                 implementation("com.squareup.okio:okio:${Versions.OKIO}")
                 implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.KOTLIN}")
@@ -54,10 +63,6 @@ kotlin {
             }
         }
 
-        target.forEach {
-            getByName("${it.name}Main").dependsOn(nativeMain)
-        }
-
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))

ktoml-file/src/macosX64Main/kotlin/com/akuleshov7/ktoml/file/FileUtilsMac.kt

@@ -0,0 +1,14 @@
+/**
+ * File utils to read files using okio
+ */
+
+package com.akuleshov7.ktoml.file
+
+import okio.FileSystem
+
+/**
+ * Implementation for getting proper file system to read files with okio
+ *
+ * @return proper FileSystem
+ */
+internal actual fun getOsSpecificFileSystem(): FileSystem = FileSystem.SYSTEM

ktoml-file/src/mingwX64Main/kotlin/com/akuleshov7/ktoml/file/FileUtilsWin.kt

@@ -0,0 +1,14 @@
+/**
+ * File utils to read files using okio
+ */
+
+package com.akuleshov7.ktoml.file
+
+import okio.FileSystem
+
+/**
+ * Implementation for getting proper file system to read files with okio
+ *
+ * @return proper FileSystem
+ */
+internal actual fun getOsSpecificFileSystem(): FileSystem = FileSystem.SYSTEM