From ab106cab82db3be8b22f2973b4d3876e8c36dc75 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 20 Jul 2019 11:42:22 +0300 Subject: [PATCH] Updated kotlin to eap --- build.gradle.kts | 9 ++++----- src/main/kotlin/scientifik/ScientifikPublishPlugin.kt | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5a08385..e04c37e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,18 +12,17 @@ version = "0.1.4-dev" repositories { gradlePluginPortal() jcenter() + maven("https://dl.bintray.com/kotlin/kotlin-eap") } -val kotlinVersion = "1.3.41" +val kotlinVersion = "1.3.50-eap-5" // Add plugins used in buildSrc as dependencies, also we should specify version only here dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") - implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.6") + implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.7") implementation("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4") implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.9.18") - implementation("com.moowork.gradle:gradle-node-plugin:1.3.1") - implementation("org.openjfx:javafx-plugin:0.0.7") } gradlePlugin { @@ -89,7 +88,7 @@ publishing { // this is a problem of this plugin pkg.apply { userOrg = "mipt-npm" - repo = "scientifik" + repo = if (project.version.toString().contains("dev")) "dev" else "scientifik" name = project.name issueTrackerUrl = "$vcs/issues" setLicenses("Apache-2.0") diff --git a/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt b/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt index 159d71d..db7d6df 100644 --- a/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt +++ b/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt @@ -257,7 +257,7 @@ open class ScientifikPublishPlugin : Plugin { // this is a problem of this plugin pkg.apply { userOrg = "mipt-npm" - repo = bintrayRepo + repo = if (project.version.toString().contains("dev")) "dev" else bintrayRepo name = project.name issueTrackerUrl = "$vcs/issues" setLicenses("Apache-2.0")