Update dependencies

This commit is contained in:
Michael Bull 2019-09-27 10:25:37 +01:00
parent 1bf2125327
commit 782fac0ced
4 changed files with 16 additions and 24 deletions

View File

@ -7,11 +7,18 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
description = "A Result monad for modelling success or failure operations." description = "A Result monad for modelling success or failure operations."
val SourceSet.kotlin: SourceDirectorySet
get() = withConvention(KotlinSourceSet::class) { kotlin }
fun BintrayExtension.pkg(configure: BintrayExtension.PackageConfig.() -> Unit) {
pkg(delegateClosureOf(configure))
}
plugins { plugins {
`maven-publish` `maven-publish`
kotlin("jvm") version ("1.3.50") kotlin("jvm") version ("1.3.50")
id("org.jetbrains.dokka") version ("0.9.18") id("org.jetbrains.dokka") version ("0.9.18")
id("com.github.ben-manes.versions") version ("0.22.0") id("com.github.ben-manes.versions") version ("0.25.0")
id("com.jfrog.bintray") version ("1.8.4") id("com.jfrog.bintray") version ("1.8.4")
id("net.researchgate.release") version ("2.8.1") id("net.researchgate.release") version ("2.8.1")
} }
@ -39,26 +46,11 @@ dependencies {
testImplementation(kotlin("test")) testImplementation(kotlin("test"))
} }
val SourceSet.kotlin: SourceDirectorySet tasks.withType<DependencyUpdatesTask> {
get() = withConvention(KotlinSourceSet::class) { kotlin } rejectVersionIf {
listOf("alpha", "beta", "rc", "cr", "m", "eap", "pr").any {
fun BintrayExtension.pkg(configure: BintrayExtension.PackageConfig.() -> Unit) {
pkg(delegateClosureOf(configure))
}
tasks.named<DependencyUpdatesTask>("dependencyUpdates") {
resolutionStrategy {
componentSelection {
all {
val rejected = listOf("alpha", "beta", "rc", "cr", "m", "eap").any {
candidate.version.contains(it, ignoreCase = true) candidate.version.contains(it, ignoreCase = true)
} }
if (rejected) {
reject("Release candidate")
}
}
}
} }
} }

View File

@ -13,7 +13,7 @@ repositories {
} }
dependencies { dependencies {
val ktorVersion = "1.2.3" val ktorVersion = "1.2.4"
implementation(rootProject) implementation(rootProject)
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
gradlew vendored
View File

@ -125,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if $cygwin ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`