Skip to content

Commit

Permalink
gradle: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
uchuhimo committed Jan 24, 2021
1 parent 71342f6 commit d23bac0
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 18 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,5 @@ gradle-app.setting
private.properties
.vscode
.java-version
act
act
*.log
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ val gpgPassphrase by extra { getPrivateProperty("gpgPassphrase") }
val useAliyun by extra { shouldUseAliyun() }

tasks.named<Wrapper>("wrapper") {
gradleVersion = "6.6"
gradleVersion = "6.8.1"
distributionType = Wrapper.DistributionType.ALL
}

Expand Down
26 changes: 13 additions & 13 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@ object Versions {
val java = JavaVersion.VERSION_1_8
const val bintrayPlugin = "1.8.5"
const val commonsText = "1.9"
const val coroutines = "1.3.9"
const val coroutines = "1.4.2"
const val dependencyManagement = "1.0.10.RELEASE"
const val dependencyUpdate = "0.33.0"
const val dokka = "1.4.10"
const val dependencyUpdate = "0.36.0"
const val dokka = "1.4.20"
const val dom4j = "2.1.3"
const val graal = "20.2.0"
const val graal = "21.0.0"
const val hamcrest = "1.3"
const val hamkrest = "1.8.0.1"
const val hocon = "1.4.0"
const val jacksonMinor = "2.11"
const val jackson = "$jacksonMinor.3"
const val hocon = "1.4.1"
const val jacksonMinor = "2.12"
const val jackson = "$jacksonMinor.1"
const val jacoco = "0.8.6"
const val jaxen = "1.2.0"
const val jgit = "5.9.0.202009080501-r"
const val jgit = "5.10.0.202012080955-r"
const val jmh = "1.25.2"
const val jmhPlugin = "0.5.2"
const val junit = "5.7.0"
const val junitPlatform = "1.7.0"
const val kotlin = "1.4.10"
const val kotlin = "1.4.21-2"
const val kotlinApi = "1.3"
const val reflections = "0.9.12"
const val slf4j = "1.7.30"
const val spark = "2.9.2"
const val spark = "2.9.3"
const val spek = "1.2.1"
const val spotless = "5.6.1"
const val spotless = "5.9.0"
const val taskTree = "1.5"
const val toml4j = "0.7.2"
const val yaml = "1.27"

const val googleJavaFormat = "1.7"
const val ktlint = "0.39.0"
const val googleJavaFormat = "1.9"
const val ktlint = "0.40.0"
}


Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en_US
org.gradle.caching=true
org.gradle.vfs.watch=true
#org.gradle.parallel=true
#org.gradle.configureondemand=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 6 additions & 0 deletions konf-core/src/main/kotlin/com/uchuhimo/konf/BaseConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package com.uchuhimo.konf
import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.SerializationFeature
import com.fasterxml.jackson.databind.cfg.CoercionAction
import com.fasterxml.jackson.databind.cfg.CoercionInputShape
import com.fasterxml.jackson.databind.module.SimpleModule
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
Expand Down Expand Up @@ -647,6 +649,10 @@ fun createDefaultMapper(): ObjectMapper = jacksonObjectMapper()
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
.enable(SerializationFeature.WRITE_DATES_WITH_ZONE_ID)
.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)
.apply {
coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty)
}
.registerModules(
SimpleModule()
.addDeserializer(String::class.java, StringDeserializer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AdHocNetworkBuffer(config: Config) {
Type.OFF_HEAP,
prefix = "heap",
description =
"""
"""
| type of network buffer.
| two type:
| - on-heap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class NetworkBuffer {
val type by optional(
Type.OFF_HEAP,
description =
"""
"""
| type of network buffer.
| two type:
| - on-heap
Expand Down

0 comments on commit d23bac0

Please sign in to comment.