Merge pull request #12 from ionspin/mac-build

Mac build

Author: Ugljesa Jovanovic

.travis.yml

@@ -2,12 +2,20 @@ matrix:
   include:
     - os: linux
       language: java
-      jdk: oraclejdk8
+      jdk: openjdk12
       env:
         KBUILD=linux
         JAVA_OPTS=-Xmx2g
       script:
         - ./gradlew build
+    - os: osx
+      language: java
+      jdk: openjdk12
+      env:
+        KBUILD=linux
+        JAVA_OPTS=-Xmx2g
+      script:
+        - ./gradlew build -x jvmTest -x jsTest
 cache:
   directories:
     - $HOME/.m2/

bignum/build.gradle.kts

@@ -18,18 +18,18 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.moowork.gradle.node.task.NodeTask
-import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 
 plugins {
-    kotlin(PluginsDeps.multiplatform)    
+    kotlin(PluginsDeps.multiplatform)
     id (PluginsDeps.mavenPublish)
     id (PluginsDeps.signing)
     id (PluginsDeps.node) version Versions.nodePlugin
     id (PluginsDeps.dokka) version Versions.dokkaPlugin
 }
 
 val sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+val sonatypeSnapshots = "https://oss.sonatype.org/content/repositories/snapshots/"
 
 val sonatypePassword : String? by project
 
@@ -41,7 +41,7 @@ repositories {
 
 }
 group = "com.ionspin.kotlin"
-version = "0.0.7"
+version = "0.0.9-SNAPSHOT"
 
 kotlin {
     jvm()
@@ -60,10 +60,20 @@ kotlin {
             }
         }
     }
-    linuxX64("linux")
+    linuxX64("linux") {
+        compilations["main"].outputKinds("static")
+    }
     iosX64("ios") {
         compilations["main"].outputKinds("framework")
     }
+    iosArm64("ios64Arm") {
+        compilations["main"].outputKinds("framework")
+    }
+    macosX64() {
+        compilations["main"].outputKinds("framework")
+    }
+
+    println(targets.names)
 
     sourceSets {
         val commonMain by getting {
@@ -107,23 +117,36 @@ kotlin {
                 implementation(kotlin("test-js"))
             }
         }
-        val iosMain by getting {
+        val nativeMain by creating {
+            dependsOn(commonMain)
             dependencies {
                 implementation(Deps.Native.coroutines)
             }
         }
+        val nativeTest by creating {
+
+        }
+        
+        val iosMain by getting {
+            dependsOn(nativeMain)
+        }
         val iosTest by getting {
+            dependsOn(nativeTest)
         }
 
-        val nativeMain by creating {
-            dependencies {
-                implementation(Deps.Native.coroutines)
-            }
+        val ios64ArmMain by getting {
+            dependsOn(nativeMain)
         }
-        val nativeTest by creating {
-            
+        val ios64ArmTest by getting {
+            dependsOn(nativeTest)
         }
 
+        val macosX64Main by getting {
+            dependsOn(nativeMain)
+        }
+        val macosX64Test by getting {
+            dependsOn(nativeTest)
+        }
         val linuxMain by getting {
             dependsOn(nativeMain)
         }
@@ -252,6 +275,15 @@ publishing {
                 password = sonatypePassword ?: ""
             }
         }
+
+        maven {
+            name = "snapshot"
+            url = uri(sonatypeSnapshots)
+            credentials {
+                username = sonatypeUsername ?: ""
+                password = sonatypePassword ?: ""
+            }
+        }
     }
 }
 

bignum/src/commonMain/kotlin/com/ionspin/kotlin/bignum/integer/util/BlockingUtil.kt

@@ -15,10 +15,9 @@
  *
  */
 
-package com.ionspin.kotlin.bignum.integer
+package com.ionspin.kotlin.bignum.integer.arithmetic
 
 import com.ionspin.kotlin.bignum.integer.base32.BigInteger32Arithmetic
-import com.ionspin.kotlin.bignum.integer.util.runTest
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlin.test.Test
 import kotlin.test.assertTrue
@@ -34,7 +33,7 @@ class BigInteger32MultiplicationTest {
 
 
     @Test
-    fun quick() = runTest {
+    fun quick() {
         assertTrue {
             val a = uintArrayOf(10U)
             val b = uintArrayOf(20U)
@@ -47,7 +46,7 @@ class BigInteger32MultiplicationTest {
 
 
     @Test
-    fun slow() = runTest {
+    fun slow() {
         val a = uintArrayOf(600123930U, 2763064752U, 3767748705U, 2696295277U, 3753527898U, 1143743615U, 4128159603U,
             2272083234U, 315684520U, 970147242U, 1329509210U, 3492695163U, 3449361588U, 1278830002U, 3123489057U,
             3720277819U, 486484208U, 2780187700U, 1985022034U, 2285210218U, 3740982094U, 727015520U, 634515817U,

bignum/src/commonMain/kotlin/com/ionspin/kotlin/bignum/integer/util/TestUtil.kt

@@ -17,10 +17,3 @@
 
 package com.ionspin.kotlin.bignum.integer.util
 
-/**
- * Created by Ugljesa Jovanovic
- * [email protected]
- * on 16-Mar-2019
- */
-actual fun <T> block(block: suspend () -> T) {
-}

bignum/src/commonTest/kotlin/com/ionspin/kotlin/bignum/integer/arithmetic/BigInteger32MultiplicationTest.kt

@@ -19,11 +19,3 @@ package com.ionspin.kotlin.bignum.integer.util
 
 import kotlinx.coroutines.runBlocking
 
-/**
- * Created by Ugljesa Jovanovic
- * [email protected]
- * on 25-Dec-12/25/18
- */
-actual fun <T> runTest(block: suspend () -> T) {
-    runBlocking { block () }
-}