Skip to content

Commit

Permalink
fix reactor#915 Bump to Kotlin plugin 1.1.61
Browse files Browse the repository at this point in the history
also FAIL on duplicate files in sources jar
  • Loading branch information
simonbasle authored Nov 28, 2017
1 parent 2a127e0 commit d204fae
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import me.champeau.gradle.japicmp.JapicmpTask
import org.gradle.api.internal.plugins.osgi.OsgiHelper

buildscript {
ext.kotlinVersion = '1.1.51'
ext.kotlinVersion = '1.1.61'
repositories {
maven { url "http://repo.spring.io/plugins-release" }
}
Expand Down Expand Up @@ -194,10 +194,10 @@ configure(subprojects) { p ->
exclude '**/*OperatorTest*.*'
}

//Workaround for https://youtrack.jetbrains.com/issue/KT-17564
// until kotlin-gradle-plugin 1.1.60 is out
// now that kotlin-gradle-plugin 1.1.60 is out with fix for https://youtrack.jetbrains.com/issue/KT-17564
// be wary and fail if the issue of source file duplication in jar comes up again
sourcesJar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
duplicatesStrategy = DuplicatesStrategy.FAIL
}

}
Expand Down

0 comments on commit d204fae

Please sign in to comment.