diff --git a/build.gradle b/build.gradle index 690a936..9afef0c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,30 +18,33 @@ repositories { } dependencies { - implementation 'mysql:mysql-connector-java:8.0.17' - implementation 'org.apache.httpcomponents:httpclient:4.5.9' + implementation 'mysql:mysql-connector-java:8.0.25' + implementation 'org.apache.httpcomponents:httpclient:4.5.13' implementation 'com.googlecode.json-simple:json-simple:1.1.1' - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.google.code.gson:gson:2.8.8' implementation platform('com.amazonaws:aws-java-sdk-bom:1.11.896') - implementation 'com.amazonaws:aws-java-sdk-s3' - testImplementation 'junit:junit:4.11' - compile 'com.google.api-client:google-api-client:1.23.0' - compile 'com.google.oauth-client:google-oauth-client-jetty:1.23.0' - compile 'com.google.apis:google-api-services-calendar:v3-rev305-1.23.0' - compile 'com.google.guava:guava:29.0-jre' + implementation 'com.amazonaws:aws-java-sdk-s3:1.12.53' + testImplementation 'junit:junit:4.13.2' + compile 'com.google.api-client:google-api-client:1.32.1' + compile 'com.google.oauth-client:google-oauth-client-jetty:1.32.1' + compile 'com.google.apis:google-api-services-calendar:v3-rev20210804-1.32.1' + compile 'com.google.guava:guava:30.1.1-jre' compile group: 'commons-cli', name: 'commons-cli', version: '1.3.1' compile group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: '0.8.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3' + compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1' + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1' compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.4' } jar { manifest { attributes( - 'Main-Class': 'de.jeyp91.App' + 'Main-Class': 'de.jeyp91.App' ) } + manifest.attributes( + 'Multi-Release': 'true' + ) from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } diff --git a/src/main/java/de/jeyp91/googlecalendar/GoogleCalendarConnector.java b/src/main/java/de/jeyp91/googlecalendar/GoogleCalendarConnector.java index d6d407b..2e00b69 100644 --- a/src/main/java/de/jeyp91/googlecalendar/GoogleCalendarConnector.java +++ b/src/main/java/de/jeyp91/googlecalendar/GoogleCalendarConnector.java @@ -8,7 +8,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets; import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.util.DateTime; import com.google.api.client.util.store.FileDataStoreFactory; import com.google.api.services.calendar.CalendarScopes; @@ -31,7 +31,7 @@ import java.util.List; public class GoogleCalendarConnector { private static final String APPLICATION_NAME = "Google Calendar API Java Quickstart"; - private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance(); + private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance(); private static final String TOKENS_DIRECTORY_PATH = "tokens"; /** diff --git a/src/main/java/de/jeyp91/googlecalendar/Utils.java b/src/main/java/de/jeyp91/googlecalendar/Utils.java index 7ddbfa4..d16abe3 100644 --- a/src/main/java/de/jeyp91/googlecalendar/Utils.java +++ b/src/main/java/de/jeyp91/googlecalendar/Utils.java @@ -22,7 +22,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets; import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport; import com.google.api.client.http.HttpTransport; import com.google.api.client.json.JsonFactory; -import com.google.api.client.json.jackson2.JacksonFactory; +import com.google.api.client.json.gson.GsonFactory; import com.google.api.client.util.DateTime; import com.google.api.client.util.store.DataStoreFactory; import com.google.api.client.util.store.FileDataStoreFactory; @@ -52,7 +52,7 @@ public class Utils { private static FileDataStoreFactory dataStoreFactory; /** Global instance of the JSON factory. */ - private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance(); + private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance(); /** Global instance of the HTTP transport. */ private static HttpTransport httpTransport; diff --git a/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java b/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java index 758e29b..545951f 100644 --- a/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java +++ b/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java @@ -3,7 +3,6 @@ package de.jeyp91.tippligaforum; import com.google.gson.*; import de.jeyp91.S3Provider; import de.jeyp91.apifootball.APIFootballMatch; -import netscape.javascript.JSObject; import org.json.simple.JSONArray; import org.json.simple.JSONObject;