Skip to content

Commit 55e0547

Browse files
committed
Update dependencies
1 parent 099e48c commit 55e0547

File tree

6 files changed

+29
-23
lines changed

6 files changed

+29
-23
lines changed

config/detekt.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ complexity:
44
exceptions:
55
TooGenericExceptionCaught:
66
active: false
7+
SwallowedException:
8+
active: false
79

810
performance:
911
SpreadOperator:
@@ -14,3 +16,5 @@ style:
1416
active: false
1517
ForbiddenComment:
1618
active: false
19+
UnnecessaryAbstractClass:
20+
active: false

gradle/versions.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
ext {
2-
version = "5.3.1"
2+
version = "5.3.3"
33
group = "com.github.TrueMB"
44

5-
gradleVersion = "6.7.1"
5+
gradleVersion = "6.9.1"
66

7-
kotlinVersion = "1.4.21"
8-
kotlinCoroutinesVersion = "1.4.2"
9-
dokkaVersion = "1.4.20"
7+
kotlinVersion = "1.5.31"
8+
kotlinCoroutinesVersion = "1.5.2-native-mt"
9+
dokkaVersion = "1.5.31"
1010

11-
jacocoVersion = "0.8.6"
12-
ktlintPluginVersion = "9.4.1"
13-
ktlintVersion = "0.40.0"
14-
detektVersion = "1.15.0"
11+
jacocoVersion = "0.8.7"
12+
ktlintPluginVersion = "10.2.0"
13+
ktlintVersion = "0.43.0"
14+
detektVersion = "1.19.0-RC1"
1515

16-
gradleVersionsPluginVersion = "0.36.0"
16+
gradleVersionsPluginVersion = "0.39.0"
1717
buildConfigPluginVersion = "1.1.8"
1818

1919
retrofitVersion = "2.9.0"
20-
okHttpVersion = "4.9.0"
21-
okioVersion = "2.9.0"
22-
moshiVersion = "1.11.0"
20+
okHttpVersion = "4.9.2"
21+
okioVersion = "3.0.0"
22+
moshiVersion = "1.12.0"
2323
moshiLazyAdaptersVersion = "2.2"
2424

25-
junitVersion = "5.7.0"
25+
junitVersion = "5.8.1"
2626
concurrentUnitVersion = "0.4.6"
2727
kluentVersion = "1.64"
28-
mockkVersion = "1.10.3-jdk8"
28+
mockkVersion = "1.12.0"
2929
}
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.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

library/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.dokka.gradle.DokkaTask
2+
13
plugins {
24
id "org.jetbrains.kotlin.jvm"
35
id "org.jetbrains.kotlin.kapt"
@@ -15,7 +17,7 @@ plugins {
1517

1618
apply from: "${rootDir}/gradle/dependencies.gradle"
1719

18-
tasks.withType(org.jetbrains.dokka.gradle.DokkaTask).configureEach {
20+
tasks.withType(DokkaTask).configureEach {
1921
dokkaSourceSets {
2022
configureEach {
2123
sourceLink {
@@ -35,13 +37,13 @@ tasks.dokkaJavadoc.configure {
3537
}
3638

3739
task sourceJar(type: Jar) {
38-
archiveClassifier = "sources"
40+
archiveClassifier.set("sources")
3941

4042
from sourceSets.main.allSource
4143
}
4244

4345
task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
44-
archiveClassifier = "javadoc"
46+
archiveClassifier.set("javadoc")
4547

4648
from javadoc.destinationDir
4749
}

library/src/main/kotlin/me/proxer/library/KotlinExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ suspend fun <T : Any> ProxerCall<T>.await(): T {
1515
if (result != null) {
1616
continuation.resume(result)
1717
} else {
18-
continuation.resumeWithException(NullPointerException())
18+
continuation.resumeWithException(NullPointerException("Couldn't load any data."))
1919
}
2020
},
2121
{ error -> continuation.resumeWithException(error) }

library/src/main/kotlin/me/proxer/library/internal/adapter/DelimitedEnumSetAdapterFactory.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ internal class DelimitedEnumSetAdapterFactory : JsonAdapter.Factory {
4545
)
4646
}
4747

48-
private class DelimitedEnumSetAdapter<T : Enum<T>> internal constructor(
48+
private class DelimitedEnumSetAdapter<T : Enum<T>>(
4949
private val enumType: Class<T>,
5050
private val delimiter: String
5151
) : JsonAdapter<Set<T>>() {
@@ -56,7 +56,7 @@ internal class DelimitedEnumSetAdapterFactory : JsonAdapter.Factory {
5656
val annotation = enumType.getField(constant.name).getAnnotation(Json::class.java)
5757
val name = annotation?.name ?: constant.name
5858

59-
name.toLowerCase(Locale.US) to constant
59+
name.lowercase(Locale.US) to constant
6060
} catch (error: NoSuchFieldException) {
6161
throw AssertionError("Missing field in ${enumType.name}", error)
6262
}
@@ -73,7 +73,7 @@ internal class DelimitedEnumSetAdapterFactory : JsonAdapter.Factory {
7373

7474
emptySet()
7575
} else {
76-
val rawParts = reader.nextString().trim().toLowerCase(Locale.US)
76+
val rawParts = reader.nextString().trim().lowercase(Locale.US)
7777

7878
if (rawParts.isEmpty()) {
7979
emptySet()

0 commit comments

Comments
 (0)