kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Updated kotlin to eap

Browse Source
This commit is contained in:
Alexander Nozik 2019-07-20 11:42:22 +03:00
parent d369145d86
commit ab106cab82
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle.kts
View File

@ -12,18 +12,17 @@ version = "0.1.4-dev"
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()
jcenter() 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 // Add plugins used in buildSrc as dependencies, also we should specify version only here
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") 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("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.9.18") 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 { gradlePlugin {
@ -89,7 +88,7 @@ publishing {
// this is a problem of this plugin // this is a problem of this plugin
pkg.apply { pkg.apply {
userOrg = "mipt-npm" userOrg = "mipt-npm"
repo = "scientifik" repo = if (project.version.toString().contains("dev")) "dev" else "scientifik"
name = project.name name = project.name
issueTrackerUrl = "$vcs/issues" issueTrackerUrl = "$vcs/issues"
setLicenses("Apache-2.0") setLicenses("Apache-2.0")

2
src/main/kotlin/scientifik/ScientifikPublishPlugin.kt
View File

@ -257,7 +257,7 @@ open class ScientifikPublishPlugin : Plugin<Project> {
// this is a problem of this plugin // this is a problem of this plugin
pkg.apply { pkg.apply {
userOrg = "mipt-npm" userOrg = "mipt-npm"
repo = bintrayRepo repo = if (project.version.toString().contains("dev")) "dev" else bintrayRepo
name = project.name name = project.name
issueTrackerUrl = "$vcs/issues" issueTrackerUrl = "$vcs/issues"
setLicenses("Apache-2.0") setLicenses("Apache-2.0")