Skip to content

Commit 1bc2dcf

Browse files
committed
chore: upgrade versions - remove stale deps
1 parent ecf3911 commit 1bc2dcf

4 files changed

Lines changed: 31 additions & 23 deletions

File tree

build.gradle

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
plugins {
2+
id 'java'
3+
id 'groovy'
4+
id 'idea'
5+
id 'eclipse'
6+
}
7+
18
group = 'com.veem'
29
version = '1.0'
310

4-
apply plugin: 'java'
5-
apply plugin: 'groovy'
6-
apply plugin: 'idea'
7-
apply plugin: 'eclipse'
8-
911
sourceCompatibility = 1.8
1012
targetCompatibility = 1.8
1113

@@ -18,24 +20,31 @@ configurations {
1820
}
1921

2022
dependencies {
21-
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8',
22-
'com.googlecode.json-simple:json-simple:1.1.1',
23-
'com.squareup.retrofit2:retrofit:2.2.0',
24-
'com.squareup.retrofit2:converter-jackson:2.2.0',
25-
'com.squareup.okhttp3:logging-interceptor:3.12.0',
26-
'com.neovisionaries:nv-i18n:1.21',
27-
'org.projectlombok:lombok:1.18.4',
28-
'org.slf4j:slf4j-api:1.7.25'
29-
testCompile 'org.spockframework:spock-core:1.2-groovy-2.5'
23+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
24+
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
25+
implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
26+
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
27+
implementation 'com.neovisionaries:nv-i18n:1.29'
28+
implementation 'org.slf4j:slf4j-api:2.0.12'
29+
30+
compileOnly 'org.projectlombok:lombok:1.18.30'
31+
annotationProcessor 'org.projectlombok:lombok:1.18.30'
32+
33+
testCompileOnly 'org.projectlombok:lombok:1.18.30'
34+
testAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
35+
36+
testImplementation 'org.apache.groovy:groovy-json:4.0.19'
37+
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
3038
}
3139

32-
task copyExtraLibs(type: Copy) {
40+
tasks.register('copyExtraLibs', Copy) {
3341
from configurations.extraLibs
34-
into tasks.jar.destinationDir
42+
into tasks.jar.destinationDirectory
3543
}
3644

3745
jar {
38-
from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
46+
from configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
3947
exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.MF', 'org/junit/**', 'junit'
48+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
4049

4150
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip

src/main/java/com/veem/client/AttachmentClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private static void writeFile(final Path targetFilePath, final ResponseBody resp
114114
catch (IOException e)
115115
{
116116
throw new VeemSdkException(e, String.format("The downloaded file could not be saved to %s",
117-
targetFilePath.toString()));
117+
targetFilePath));
118118
}
119119
}
120120
}

src/main/java/com/veem/client/ResponseHandler.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static java.util.Optional.ofNullable;
44

5+
import com.fasterxml.jackson.databind.JsonNode;
56
import com.fasterxml.jackson.databind.ObjectMapper;
67
import com.veem.exceptions.VeemBadRequestException;
78
import com.veem.exceptions.VeemConflictException;
@@ -14,8 +15,6 @@
1415
import com.veem.exceptions.VeemUnauthorizedException;
1516
import lombok.extern.slf4j.Slf4j;
1617
import lombok.val;
17-
import org.json.simple.JSONObject;
18-
import org.json.simple.JSONValue;
1918
import retrofit2.Response;
2019

2120
import java.io.IOException;
@@ -114,10 +113,10 @@ private static String extractError(final Response<?> response, final String erro
114113
String error;
115114
try
116115
{
117-
val errorResponse = (JSONObject) JSONValue.parse(errorBody);
116+
val errorResponse = MAPPER.readTree(errorBody);
118117
error = ofNullable(errorResponse)
119118
.map(er -> er.get("message"))
120-
.map(Object::toString)
119+
.map(JsonNode::asText)
121120
.orElseThrow(RuntimeException::new);
122121
log.error(error);
123122
}

0 commit comments

Comments
 (0)