diff --git a/.gitignore b/.gitignore index 0fa59f100..5b55fc854 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ # Cache of project .gradletasknamecache +gradle.properties \ No newline at end of file diff --git a/README.md b/README.md index 7defe0482..8f914d791 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ platform even if they could be done in common module because of platform perform Currently the main focus of development is the JVM platform, contribution of implementations for Kotlin - Native and Kotlin - JS is welcome. +It is planned to move project structure to [kotlin gradle mpp structure](https://github.com/h0tk3y/k-new-mpp-samples) after release of kotlin 1.3. + ## Performance The calculation performance is one of major goals of KMath in the future, but in some cases it is not possible to achieve both performance and flexibility. We expect to firstly focus on creating convenient universal API and then work on diff --git a/build.gradle b/build.gradle index dbe2ef5de..a3af48ee0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,50 @@ buildscript { - ext.kotlin_version = '1.2.61' + ext.kotlin_version = '1.2.71' repositories { - mavenCentral() + jcenter() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4+" } } -subprojects{ +allprojects{ apply plugin: 'maven' + apply plugin: 'maven-publish' + apply plugin: "com.jfrog.artifactory" + + group = 'scientifik' + version = '0.0.1-SNAPSHOT' } -group = 'scientifik' -version = '0.0.1-SNAPSHOT' +artifactory { + contextUrl = "${artifactory_contextUrl}" //The base Artifactory URL if not overridden by the publisher/resolver + publish { + repository { + repoKey = 'gradle-dev-local' + username = "${artifactory_user}" + password = "${artifactory_password}" + maven = true + + } + + defaults { + publications 'defaultPublication' + publishBuildInfo = true + publishArtifacts = true + publishPom = true + publishIvy = false + } + } + resolve { + repository { + repoKey = 'gradle-dev' + username = "${artifactory_user}" + password = "${artifactory_password}" + maven = true + } + } +} \ No newline at end of file diff --git a/kmath-jvm/build.gradle b/kmath-jvm/build.gradle index 110dc0287..b8952a379 100644 --- a/kmath-jvm/build.gradle +++ b/kmath-jvm/build.gradle @@ -27,4 +27,12 @@ kotlin { experimental { coroutines "enable" } +} + +publishing { + publications { + defaultPublication(MavenPublication) { + from components.java + } + } } \ No newline at end of file