Skip to content

Commit 3643953

Browse files
author
Junpei Koyama
authored
Merge pull request #336 from imasahiro/dep
Depenedencies update
2 parents 8b55b4d + c185389 commit 3643953

File tree

20 files changed

+77
-32
lines changed

20 files changed

+77
-32
lines changed

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// ./gradlew clean && ./gradlew uploadArchives -Prelease
1818

1919
buildscript {
20-
ext.kotlin_version = '1.3.21'
20+
ext.kotlin_version = '1.3.31'
2121

2222
repositories {
2323
mavenCentral()
@@ -26,10 +26,10 @@ buildscript {
2626
}
2727
dependencies {
2828
classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
29-
classpath 'com.puppycrawl.tools:checkstyle:8.19'
30-
classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.7.1'
29+
classpath 'com.puppycrawl.tools:checkstyle:8.20'
30+
classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:2.0.0'
3131
classpath 'gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:2.0.0'
32-
classpath 'io.franzbecker:gradle-lombok:2.1'
32+
classpath 'io.franzbecker:gradle-lombok:3.0.0'
3333
classpath 'io.spring.gradle:dependency-management-plugin:1.0.7.RELEASE'
3434
classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
3535
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE'
@@ -89,14 +89,14 @@ subprojects {
8989
version = rootProject.version
9090

9191
ext['guava.version'] = '27.1-jre'
92-
ext['okhttp3.version'] = '3.14.0'
92+
ext['okhttp3.version'] = '3.14.2'
9393
ext['retrofit.version'] = '2.5.0'
9494

9595
dependencyManagement {
9696
if (project.name != 'test-boot1-compatibility') {
9797
imports {
9898
mavenBom 'io.spring.platform:platform-bom:Cairo-RELEASE'
99-
mavenBom 'org.springframework.boot:spring-boot-dependencies:2.1.3.RELEASE'
99+
mavenBom 'org.springframework.boot:spring-boot-dependencies:2.1.5.RELEASE'
100100
}
101101
}
102102

@@ -109,7 +109,7 @@ subprojects {
109109
entry 'retrofit'
110110
}
111111
dependency 'org.assertj:assertj-core:3.12.1'
112-
dependency 'org.projectlombok:lombok:1.18.6'
112+
dependency 'org.projectlombok:lombok:1.18.8'
113113
}
114114
}
115115

@@ -162,7 +162,7 @@ subprojects {
162162
}
163163

164164
lombok {
165-
version = '1.18.4'
165+
version = '1.18.8'
166166
}
167167

168168
if (!project.name.startsWith('sample-') && !project.name.startsWith('test-')) {
@@ -200,7 +200,7 @@ subprojects {
200200

201201
checkstyle {
202202
configProperties = [projectDir: rootProject.projectDir]
203-
toolVersion = '8.19'
203+
toolVersion = '8.20'
204204
}
205205

206206
spotbugs {

gradle/wrapper/gradle-wrapper.jar

-125 Bytes
Binary file not shown.
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.3.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS='"-Xmx64m"'
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

gradlew.bat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem http://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS="-Xmx64m"
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

line-bot-model/src/main/java/com/linecorp/bot/model/action/CameraAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@ public static CameraAction withLabel(final String label) {
4747
}
4848

4949
@JsonPOJOBuilder(withPrefix = "")
50-
public static class CameraActionBuilder {}
50+
public static class CameraActionBuilder {
51+
}
5152
}

line-bot-model/src/main/java/com/linecorp/bot/model/action/CameraRollAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ public static CameraRollAction withLabel(final String label) {
4545
}
4646

4747
@JsonPOJOBuilder(withPrefix = "")
48-
public static class CameraRollActionBuilder {}
48+
public static class CameraRollActionBuilder {
49+
}
4950
}

line-bot-model/src/main/java/com/linecorp/bot/model/action/LocationAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,6 @@ public static LocationAction withLabel(final String label) {
4747
}
4848

4949
@JsonPOJOBuilder(withPrefix = "")
50-
public static class LocationActionBuilder {}
50+
public static class LocationActionBuilder {
51+
}
5152
}

line-bot-model/src/main/java/com/linecorp/bot/model/message/AudioMessage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,6 @@ public AudioMessage(final String originalContentUrl, final Integer duration) {
6262
}
6363

6464
@JsonPOJOBuilder(withPrefix = "")
65-
public static class AudioMessageBuilder {}
65+
public static class AudioMessageBuilder {
66+
}
6667
}

line-bot-model/src/main/java/com/linecorp/bot/model/message/FlexMessage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,6 @@ public FlexMessage(
6262
}
6363

6464
@JsonPOJOBuilder(withPrefix = "")
65-
public static class FlexMessageBuilder {}
65+
public static class FlexMessageBuilder {
66+
}
6667
}

0 commit comments

Comments
 (0)