refactoring gradle prop

Author: devcrocod

build.gradle.kts

@@ -11,14 +11,15 @@ buildscript {
 }
 
 plugins {
-    val kotlinVersion: String by System.getProperties()
-    kotlin("jvm") version kotlinVersion
+    val kotlin_version: String by System.getProperties()
+    val nexus_version: String by System.getProperties()
 
-    id("io.codearte.nexus-staging") version "0.22.0"
+    kotlin("jvm") version kotlin_version
+    id("io.codearte.nexus-staging") version nexus_version
 }
 
-val kotlinVersion: String by System.getProperties()
-val multikVersion: String by project
+val kotlin_version: String by System.getProperties()
+val multik_version: String by project
 val unpublished = listOf("multik", "multik_jni")
 
 allprojects {
@@ -27,7 +28,7 @@ allprojects {
     }
 
     group = "org.jetbrains.kotlinx"
-    version = multikVersion
+    version = multik_version
 
     tasks.withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "1.8"

gradle.properties

@@ -1,3 +1,10 @@
 kotlin.code.style=official
-systemProp.kotlinVersion=1.5.31
-multikVersion=0.1.0-dev-3
+
+multik_version=0.1.0
+
+systemProp.kotlin_version=1.5.31
+systemProp.nexus_version=0.22.0
+systemProp.dokka_version=1.5.31
+
+openblas_version=0.3.18
+common_csv_version=1.9.0

gradle/openblas.gradle

@@ -4,8 +4,8 @@
 
 
 ext {
-    openblasBranch = 'v0.3.18'
-    openblasRoot = '0.3.18'
+    openblasBranch = "v$openblas_version"
+    openblasRoot = openblas_version
 }
 
 buildscript {

multik-api/build.gradle.kts

@@ -3,16 +3,19 @@
  */
 
 plugins {
-    id("org.jetbrains.dokka") version "1.5.0"
+    val dokka_version: String by System.getProperties()
+
+    id("org.jetbrains.dokka") version dokka_version
 }
 
 kotlin {
     explicitApi()
 }
 
+val common_csv_version: String by project
 dependencies {
     implementation(kotlin("reflect"))
-    implementation("org.apache.commons:commons-csv:1.9.0")
+    implementation("org.apache.commons:commons-csv:$common_csv_version")
 }
 
 

multik-native/build.gradle.kts

@@ -19,7 +19,6 @@ val os = when {
 }
 
 tasks.jar {
-    dependsOn("multik_jni:assembleRelease${os.capitalize()}")
     from("$buildDir/libs")
     exclude("*.jar")
 }
@@ -30,9 +29,6 @@ tasks.test {
     doFirst {
         copy {
             from(fileTree("${project.childProjects["multik_jni"]!!.buildDir}/lib/main/debug").files)
-//            from(fileTree("${project.childProjects["multik_jni"]!!.buildDir}/lib/main/release/${os}/").files.filter {
-//                "stripped" !in it.path
-//            })
             into("$buildDir/libs")
         }
     }

multik-native/multik_jni/build.gradle.kts

@@ -11,8 +11,8 @@ plugins {
 apply(from = "$rootDir/gradle/openblas.gradle")
 
 val gccMinGWPath: String? = System.getenv("MinGW_x64_Bin_Path")
-val gccLibPath: String? = System.getenv("path_to_libgcc")
-val gccDarwin: String? = System.getenv("path_to_gcc_darwin") ?: gccLibPath
+val gccLibPath: String = System.getenv("path_to_libgcc") ?: ""
+val gccDarwin: String = System.getenv("path_to_gcc_darwin") ?: gccLibPath
 
 library {
     source.from(file("src/main/cpp"))
@@ -67,8 +67,6 @@ tasks.withType(LinkSharedLibrary::class.java).configureEach {
                             "$gccDarwin/libgcc.a",
                             "$gccLibPath/libgfortran.a", "$gccLibPath/libquadmath.a"
                         )
-                    it.operatingSystem.isLinux -> emptyList()
-//                        listOf("$gccLibPath/libgfortran.a", "$gccLibPath/libquadmath.a")
                     else -> emptyList()
                 }
         }