Skip to content

Commit 50dce63

Browse files
committed
Updated dependencies
1 parent bfdcfbc commit 50dce63

File tree

3 files changed

+32
-19
lines changed

3 files changed

+32
-19
lines changed

build.gradle.kts

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
12
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
23
import org.jetbrains.dokka.gradle.DokkaTask
34
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4-
import com.avast.gradle.dockercompose.ComposeSettings
55

66
plugins {
77
kotlin("jvm")
88
application
99
`maven-publish`
1010
signing
1111
id("org.jetbrains.dokka") version "1.4.30"
12-
id("com.avast.gradle.docker-compose") version "0.14.2"
12+
id("com.avast.gradle.docker-compose") version "0.14.3"
1313
id("com.github.ben-manes.versions") version "0.38.0"
1414
}
1515

@@ -28,6 +28,9 @@ application {
2828

2929
repositories {
3030
mavenCentral()
31+
// Temporary until Dokka is fully published on maven central.
32+
// https://github.com/Kotlin/kotlinx.html/issues/81
33+
maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
3134
}
3235

3336
sourceSets {
@@ -85,7 +88,7 @@ dependencies {
8588
runtimeOnly("org.apache.hadoop:hadoop-hdfs-client:$hadoopVersion")
8689

8790
val radarSchemasVersion: String by project
88-
testImplementation("org.radarcns:radar-schemas-commons:$radarSchemasVersion")
91+
testImplementation("org.radarbase:radar-schemas-commons:$radarSchemasVersion")
8992

9093
val junitVersion: String by project
9194
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
@@ -94,8 +97,8 @@ dependencies {
9497
testImplementation("org.hamcrest:hamcrest-all:1.3")
9598
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
9699

97-
val kotlinVersion: String by project
98-
dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:$kotlinVersion")
100+
val dokkaVersion: String by project
101+
dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:$dokkaVersion")
99102
}
100103

101104
tasks.withType<KotlinCompile> {
@@ -182,10 +185,6 @@ val dokkaJar by tasks.registering(Jar::class) {
182185
dependsOn(tasks.dokkaJavadoc)
183186
}
184187

185-
tasks.withType<DokkaTask> {
186-
logging.level = LogLevel.QUIET
187-
}
188-
189188
tasks.withType<Jar> {
190189
manifest {
191190
attributes(
@@ -272,6 +271,19 @@ tasks.withType<Sign> {
272271
onlyIf { gradle.taskGraph.hasTask("${project.path}:publish") }
273272
}
274273

274+
fun isNonStable(version: String): Boolean {
275+
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
276+
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
277+
val isStable = stableKeyword || regex.matches(version)
278+
return isStable.not()
279+
}
280+
281+
tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
282+
rejectVersionIf {
283+
isNonStable(candidate.version)
284+
}
285+
}
286+
275287
tasks.wrapper {
276-
gradleVersion = "6.8.3"
288+
gradleVersion = "7.0"
277289
}

gradle.properties

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
kotlinVersion=1.4.32
22
kotlin.code.style=official
33

4-
avroVersion=1.10.1
5-
jacksonVersion=2.12.0
4+
avroVersion=1.10.2
5+
jacksonVersion=2.12.2
66
hadoopVersion=3.3.0
7-
jCommanderVersion=1.78
7+
jCommanderVersion=1.81
88
almworksVersion=1.1.2
9-
junitVersion=5.7.0
10-
minioVersion=8.0.3
11-
jedisVersion=3.4.0
9+
junitVersion=5.7.1
10+
minioVersion=8.2.0
11+
jedisVersion=3.5.2
1212
slf4jVersion=1.7.30
13-
azureStorageVersion=12.9.0
14-
radarSchemasVersion=0.5.15
13+
azureStorageVersion=12.10.2
14+
radarSchemasVersion=0.6.0
1515
mockitoVersion=3.8.0
16+
dokkaVersion=1.4.30
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-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)