Merge pull request #11 from ionspin/release-0.0.3

Release 0.0.3/0.0.4-SNAPSHOT

.travis.yml

@@ -39,7 +39,7 @@ matrix:
         - source ~/.install-jdk-travis.sh
       script:
         - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./gradlew build ; fi'
-        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./gradlew build publishMingwx86PublicationToSnapshotRepository publishMingwx64PublicationToSnapshotRepository; fi'
+        - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./gradlew build publishMingwx64PublicationToSnapshotRepository; fi'
 cache:
   directories:
     - $HOME/.m2/

macPublishToMaven.sh

@@ -0,0 +1 @@
+./gradlew publishAllPublicationsToMavenRepository -x publishMetadataPublicationToMavenRepository -x publishKotlinMultiplatformPublicationToMavenRepository

multiplatform-crypto/build.gradle.kts

@@ -47,7 +47,7 @@ repositories {
 
 }
 group = "com.ionspin.kotlin"
-version = "0.0.3-SNAPSHOT"
+version = "0.0.4-SNAPSHOT"
 
 val ideaActive = System.getProperty("idea.active") == "true"
 
@@ -68,6 +68,7 @@ kotlin {
             "windows" -> mingwX64("native")
         }
     }
+    if (hostOsName == "linux") {
         jvm()
         js {
             compilations {
@@ -108,6 +109,23 @@ kotlin {
                 }
             }
         }
+        linuxArm32Hfp() {
+            binaries {
+                staticLib {
+                }
+            }
+        }
+
+        linuxArm64() {
+            binaries {
+                staticLib {
+                }
+            }
+        }
+
+    }
+
+    if (hostOsName == "macos") {
         iosX64("ios") {
             binaries {
                 framework {
@@ -137,6 +155,8 @@ kotlin {
                 }
             }
         }
+    }
+    if (hostOsName == "windows") {
 
         mingwX64() {
             binaries {
@@ -145,6 +165,7 @@ kotlin {
                 }
             }
         }
+    }
 // No coroutines support for mingwX86
 //    mingwX86() {
 //        binaries {
@@ -154,19 +175,6 @@ kotlin {
 //        }
 //    }
 
-    linuxArm32Hfp() {
-        binaries {
-            staticLib {
-            }
-        }
-    }
-
-    linuxArm64() {
-        binaries {
-            staticLib {
-            }
-        }
-    }
 
     println(targets.names)
 
@@ -185,34 +193,7 @@ kotlin {
                 implementation(kotlin(Deps.Common.testAnnotation))
             }
         }
-        val jvmMain by getting {
+
-            dependencies {
-                implementation(kotlin(Deps.Jvm.stdLib))
-                implementation(kotlin(Deps.Jvm.test))
-                implementation(kotlin(Deps.Jvm.testJUnit))
-                implementation(Deps.Jvm.coroutinesCore)
-            }
-        }
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin(Deps.Jvm.test))
-                implementation(kotlin(Deps.Jvm.testJUnit))
-                implementation(Deps.Jvm.coroutinesTest)
-                implementation(kotlin(Deps.Jvm.reflection))
-            }
-        }
-        val jsMain by getting {
-            dependencies {
-                implementation(kotlin(Deps.Js.stdLib))
-                implementation(kotlin(Deps.Js.test))
-                implementation(Deps.Js.coroutines)
-            }
-        }
-        val jsTest by getting {
-            dependencies {
-                implementation(kotlin("test-js"))
-            }
-        }
         val nativeMain = if (ideaActive) {
             val nativeMain by getting {
                 dependsOn(commonMain)
@@ -242,6 +223,61 @@ kotlin {
             nativeTest
         }
 
+        if (hostOsName == "linux") {
+            val jvmMain by getting {
+                dependencies {
+                    implementation(kotlin(Deps.Jvm.stdLib))
+                    implementation(kotlin(Deps.Jvm.test))
+                    implementation(kotlin(Deps.Jvm.testJUnit))
+                    implementation(Deps.Jvm.coroutinesCore)
+                }
+            }
+            val jvmTest by getting {
+                dependencies {
+                    implementation(kotlin(Deps.Jvm.test))
+                    implementation(kotlin(Deps.Jvm.testJUnit))
+                    implementation(Deps.Jvm.coroutinesTest)
+                    implementation(kotlin(Deps.Jvm.reflection))
+                }
+            }
+            val jsMain by getting {
+                dependencies {
+                    implementation(kotlin(Deps.Js.stdLib))
+                    implementation(kotlin(Deps.Js.test))
+                    implementation(Deps.Js.coroutines)
+                }
+            }
+            val jsTest by getting {
+                dependencies {
+                    implementation(kotlin("test-js"))
+                }
+            }
+            val linuxMain by getting {
+                dependsOn(nativeMain)
+            }
+            val linuxTest by getting {
+                dependsOn(nativeTest)
+            }
+
+            val linuxArm32HfpMain by getting {
+                dependsOn(nativeMain)
+            }
+
+            val linuxArm32HfpTest by getting {
+                dependsOn(nativeTest)
+            }
+
+            val linuxArm64Main by getting {
+                dependsOn(nativeMain)
+            }
+
+            val linuxArm64Test by getting {
+                dependsOn(nativeTest)
+            }
+
+        }
+
+        if (hostOsName == "macos") {
 
             val iosMain by getting {
                 dependsOn(nativeMain)
@@ -270,12 +306,8 @@ kotlin {
             val macosX64Test by getting {
                 dependsOn(nativeTest)
             }
-        val linuxMain by getting {
-            dependsOn(nativeMain)
-        }
-        val linuxTest by getting {
-            dependsOn(nativeTest)
         }
+
 //      Coroutines don't support mingwx86 yet
 //        val mingwX86Main by getting {
 //            dependsOn(commonMain)
@@ -288,6 +320,7 @@ kotlin {
 //            dependsOn(commonTest)
 //        }
 //
+        if (hostOsName == "windows") {
             val mingwX64Main by getting {
                 dependsOn(commonMain)
                 dependencies {
@@ -298,22 +331,9 @@ kotlin {
             val mingwX64Test by getting {
                 dependsOn(commonTest)
             }
-
-        val linuxArm32HfpMain by getting {
-            dependsOn(nativeMain)
         }
 
-        val linuxArm32HfpTest by getting {
-            dependsOn(nativeTest)
-        }
 
-        val linuxArm64Main by getting {
-            dependsOn(nativeMain)
-        }
-
-        val linuxArm64Test by getting {
-            dependsOn(nativeTest)
-        }
         all {
             languageSettings.enableLanguageFeature("InlineClasses")
         }
@@ -333,9 +353,7 @@ task<Copy>("copyPackageJson") {
 }
 
 tasks {
-    val npmInstall by getting
+
-    val compileKotlinJs by getting(AbstractCompile::class)
-    val compileTestKotlinJs by getting(Kotlin2JsCompile::class)
 
     create<Jar>("javadocJar") {
         dependsOn(dokka)
@@ -355,6 +373,11 @@ tasks {
             platforms = listOf("Common")
         }
     }
+    if (getHostOsName() == "linux") {
+
+        val npmInstall by getting
+        val compileKotlinJs by getting(AbstractCompile::class)
+        val compileTestKotlinJs by getting(Kotlin2JsCompile::class)
 
         val jvmTest by getting(Test::class) {
             testLogging {
@@ -370,14 +393,6 @@ tasks {
             }
         }
 
-    val mingwX64Test by getting(KotlinNativeTest::class) {
-
-        testLogging {
-            events("PASSED", "FAILED", "SKIPPED")
-            showStandardStreams = true
-        }
-    }
-
         val jsNodeTest by getting(KotlinJsTest::class) {
 
             testLogging {
@@ -393,6 +408,17 @@ tasks {
 //             showStandardStreams = true
 //        }
 //    }
+    }
+
+    if (getHostOsName() == "windows") {
+        val mingwX64Test by getting(KotlinNativeTest::class) {
+
+            testLogging {
+                events("PASSED", "FAILED", "SKIPPED")
+                showStandardStreams = true
+            }
+        }
+    }
 
 }