Working linux x64, macosx64 and mingwx64 builds with libsodium, cleaned up api build.grade, extracted version name and group

This commit is contained in:
Ugljesa Jovanovic 2020-05-30 00:33:31 +02:00 committed by Ugljesa Jovanovic
parent ce226d9f30
commit 137fe3fe62
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
4 changed files with 34 additions and 34 deletions

View File

@ -27,6 +27,11 @@ object Versions {
} }
object Published {
val group = "com.ionspin.kotlin"
val version = "0.0.5-SNAPSHOT"
}
object Deps { object Deps {
object Common { object Common {

View File

@ -17,9 +17,8 @@
@file:Suppress("UnstableApiUsage") @file:Suppress("UnstableApiUsage")
import org.gradle.api.tasks.testing.logging.TestLogging
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
plugins { plugins {
@ -34,8 +33,8 @@ repositories {
jcenter() jcenter()
} }
group = "com.ionspin.kotlin" group = Published.group
version = "0.0.4-SNAPSHOT" version = Published.version
val ideaActive = System.getProperty("idea.active") == "true" val ideaActive = System.getProperty("idea.active") == "true"
@ -90,19 +89,19 @@ kotlin {
} }
} }
//Not supported in coroutines at the moment //Not supported in coroutines at the moment
// linuxArm32Hfp() { linuxArm32Hfp() {
// binaries { binaries {
// staticLib { staticLib {
// } }
// } }
// } }
//Not supported in coroutines at the moment //Not supported in coroutines at the moment
// linuxArm64() { linuxArm64() {
// binaries { binaries {
// staticLib { staticLib {
// } }
// } }
// } }
} }
@ -146,15 +145,17 @@ kotlin {
} }
} }
} }
mingwX86() {
binaries {
staticLib {
}
}
}
} }
// No coroutines support for mingwX86
// mingwX86() {
// binaries {
// staticLib {
//
// }
// }
// }
println(targets.names) println(targets.names)
@ -179,26 +180,22 @@ kotlin {
implementation(kotlin(Deps.Jvm.stdLib)) implementation(kotlin(Deps.Jvm.stdLib))
implementation(kotlin(Deps.Jvm.test)) implementation(kotlin(Deps.Jvm.test))
implementation(kotlin(Deps.Jvm.testJUnit)) implementation(kotlin(Deps.Jvm.testJUnit))
implementation(Deps.Jvm.coroutinesCore)
} }
} }
val jvmTest by getting { val jvmTest by getting {
dependencies { dependencies {
implementation(kotlin(Deps.Jvm.test)) implementation(kotlin(Deps.Jvm.test))
implementation(kotlin(Deps.Jvm.testJUnit)) implementation(kotlin(Deps.Jvm.testJUnit))
implementation(Deps.Jvm.coroutinesTest)
implementation(kotlin(Deps.Jvm.reflection)) implementation(kotlin(Deps.Jvm.reflection))
} }
} }
val jsMain by getting { val jsMain by getting {
dependencies { dependencies {
implementation(kotlin(Deps.Js.stdLib)) implementation(kotlin(Deps.Js.stdLib))
implementation(Deps.Js.coroutines)
} }
} }
val jsTest by getting { val jsTest by getting {
dependencies { dependencies {
implementation(Deps.Js.coroutines)
implementation(kotlin(Deps.Js.test)) implementation(kotlin(Deps.Js.test))
} }
} }
@ -213,8 +210,6 @@ kotlin {
} }
tasks { tasks {
create<Jar>("javadocJar") { create<Jar>("javadocJar") {
dependsOn(dokka) dependsOn(dokka)
archiveClassifier.set("javadoc") archiveClassifier.set("javadoc")

View File

@ -45,8 +45,8 @@ repositories {
jcenter() jcenter()
} }
group = "com.ionspin.kotlin" group = Published.group
version = "0.0.4-SNAPSHOT" version = Published.version
val ideaActive = System.getProperty("idea.active") == "true" val ideaActive = System.getProperty("idea.active") == "true"

View File

@ -42,8 +42,8 @@ repositories {
jcenter() jcenter()
} }
group = "com.ionspin.kotlin" group = Published.group
version = "0.0.4-SNAPSHOT" version = Published.version
val ideaActive = System.getProperty("idea.active") == "true" val ideaActive = System.getProperty("idea.active") == "true"