Skip to content

Commit 58571a2

Browse files
committed
Update dependencies
1 parent 4e1cf75 commit 58571a2

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

build.gradle.kts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fun BintrayExtension.pkg(configure: BintrayExtension.PackageConfig.() -> Unit) {
1515
plugins {
1616
`maven-publish`
1717
kotlin("jvm") version ("1.3.50")
18-
id("com.github.ben-manes.versions") version ("0.22.0")
18+
id("com.github.ben-manes.versions") version ("0.25.0")
1919
id("com.jfrog.bintray") version ("1.8.4")
2020
id("org.jetbrains.dokka") version ("0.9.18")
2121
id("net.researchgate.release") version ("2.8.1")
@@ -30,25 +30,17 @@ repositories {
3030
dependencies {
3131
implementation(kotlin("stdlib"))
3232
implementation("com.michael-bull.kotlin-result:kotlin-result:1.1.3")
33-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0")
34-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.5.1"))
33+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1")
34+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.5.2"))
3535
testImplementation("org.junit.jupiter:junit-jupiter")
36-
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.0")
36+
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.1")
3737
testImplementation("io.mockk:mockk:1.9.3")
3838
}
3939

40-
tasks.named<DependencyUpdatesTask>("dependencyUpdates") {
41-
resolutionStrategy {
42-
componentSelection {
43-
all {
44-
val rejected = listOf("alpha", "beta", "rc", "cr", "m", "eap").any {
45-
candidate.version.contains(it, ignoreCase = true)
46-
}
47-
48-
if (rejected) {
49-
reject("Release candidate")
50-
}
51-
}
40+
tasks.withType<DependencyUpdatesTask> {
41+
rejectVersionIf {
42+
listOf("alpha", "beta", "rc", "cr", "m", "eap", "pr").any {
43+
candidate.version.contains(it, ignoreCase = true)
5244
}
5345
}
5446
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ if $darwin; then
125125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126126
fi
127127

128-
# For Cygwin, switch paths to Windows format before running java
129-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132132
JAVACMD=`cygpath --unix "$JAVACMD"`

settings.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
enableFeaturePreview("STABLE_PUBLISHING")
2-
31
rootProject.name = "kotlin-retry"

0 commit comments

Comments
 (0)