optimise update deps

Furtif · Furtif · commit 15aa4b20a095 · 2018-09-08T16:11:11.000+02:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 16 10:42:32 CEST 2016
+#Sat Sep 08 15:24:02 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -92,14 +92,14 @@ checkstyleMain.doLast {
 
 dependencies {
     compile 'svarzee.gps:gpsoauth:0.3'
-    compile 'com.squareup.okio:okio:1.9.0'
-    compile 'com.squareup.moshi:moshi:1.2.0'
-    compile 'com.annimon:stream:1.1.1'
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'com.google.protobuf:protobuf-java:3.5.1'
-    compile 'io.reactivex:rxjava:1.1.8'
+    compile 'com.squareup.okio:okio:2.0.0'
+    compile 'com.squareup.moshi:moshi:1.6.0'
+    compile 'com.annimon:stream:1.2.1'
+    compile 'com.squareup.okhttp3:okhttp:3.11.0'
+    compile 'com.google.protobuf:protobuf-java:3.6.1'
+    compile 'io.reactivex:rxjava:1.3.4'
     compile 'net.jpountz.lz4:lz4:1.3.0'
-    compileOnly 'org.projectlombok:lombok:1.16.10'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
 }
 
 idea {
diff --git a/library/src/main/java/com/pokegoapi/api/PokemonGo.java b/library/src/main/java/com/pokegoapi/api/PokemonGo.java
@@ -49,12 +49,7 @@
 import com.pokegoapi.api.settings.templates.TempFileTemplateProvider;
 import com.pokegoapi.auth.CredentialProvider;
 import com.pokegoapi.exceptions.request.RequestFailedException;
-import com.pokegoapi.main.CommonRequests;
-import com.pokegoapi.main.Heartbeat;
-import com.pokegoapi.main.RequestHandler;
-import com.pokegoapi.main.ServerPlatformRequest;
-import com.pokegoapi.main.ServerRequest;
-import com.pokegoapi.main.ServerRequestEnvelope;
+import com.pokegoapi.main.*;
 import com.pokegoapi.util.ClientInterceptor;
 import com.pokegoapi.util.SystemTimeImpl;
 import com.pokegoapi.util.Time;
@@ -65,11 +60,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
+import java.util.*;
 
 
 public class PokemonGo {
diff --git a/library/src/main/java/com/pokegoapi/api/device/ActivityStatus.java b/library/src/main/java/com/pokegoapi/api/device/ActivityStatus.java
@@ -15,13 +15,12 @@
 
 package com.pokegoapi.api.device;
 
+import POGOProtos.Networking.Envelopes.SignatureOuterClass;
 import com.google.protobuf.ByteString;
 import com.pokegoapi.api.PokemonGo;
 
 import java.util.Random;
 
-import POGOProtos.Networking.Envelopes.SignatureOuterClass;
-
 /**
  * Created by fabianterhorst on 22.08.16.
  */
diff --git a/library/src/main/java/com/pokegoapi/api/gym/Battle.java b/library/src/main/java/com/pokegoapi/api/gym/Battle.java
@@ -39,14 +39,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.PriorityBlockingQueue;
 
diff --git a/library/src/main/java/com/pokegoapi/api/gym/Gym.java b/library/src/main/java/com/pokegoapi/api/gym/Gym.java
@@ -27,7 +27,6 @@
 import POGOProtos.Networking.Requests.RequestTypeOuterClass.RequestType;
 import POGOProtos.Networking.Responses.FortDeployPokemonResponseOuterClass.FortDeployPokemonResponse;
 import POGOProtos.Networking.Responses.GymGetInfoResponseOuterClass.GymGetInfoResponse;
-
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.pokegoapi.api.PokemonGo;
diff --git a/library/src/main/java/com/pokegoapi/api/inventory/Hatchery.java b/library/src/main/java/com/pokegoapi/api/inventory/Hatchery.java
@@ -27,11 +27,7 @@
 import com.pokegoapi.main.ServerRequest;
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class Hatchery {
 	@Getter
diff --git a/library/src/main/java/com/pokegoapi/api/inventory/Inventories.java b/library/src/main/java/com/pokegoapi/api/inventory/Inventories.java
@@ -38,13 +38,7 @@
 import com.pokegoapi.main.ServerRequest;
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 
 public class Inventories {
diff --git a/library/src/main/java/com/pokegoapi/api/inventory/ItemBag.java b/library/src/main/java/com/pokegoapi/api/inventory/ItemBag.java
@@ -33,12 +33,7 @@
 import com.pokegoapi.main.ServerRequest;
 import com.pokegoapi.util.Log;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
diff --git a/library/src/main/java/com/pokegoapi/api/inventory/PokeBank.java b/library/src/main/java/com/pokegoapi/api/inventory/PokeBank.java
@@ -38,12 +38,7 @@
 import com.pokegoapi.main.ServerResponse;
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class PokeBank {
 	@Getter
diff --git a/library/src/main/java/com/pokegoapi/api/listener/PokestopListener.java b/library/src/main/java/com/pokegoapi/api/listener/PokestopListener.java
@@ -1,7 +1,7 @@
 package com.pokegoapi.api.listener;
 
-import com.pokegoapi.api.map.fort.PokestopLootResult;
 import com.pokegoapi.api.map.fort.Fort;
+import com.pokegoapi.api.map.fort.PokestopLootResult;
 
 /**
  * Listener for all pokestop related events.
diff --git a/library/src/main/java/com/pokegoapi/api/map/Point.java b/library/src/main/java/com/pokegoapi/api/map/Point.java
@@ -16,9 +16,7 @@
 package com.pokegoapi.api.map;
 
 import POGOProtos.Map.SpawnPointOuterClass;
-
 import com.pokegoapi.util.MapPoint;
-
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/library/src/main/java/com/pokegoapi/api/map/fort/FortDetails.java b/library/src/main/java/com/pokegoapi/api/map/fort/FortDetails.java
@@ -19,7 +19,6 @@
 import POGOProtos.Map.Fort.FortModifierOuterClass;
 import POGOProtos.Map.Fort.FortTypeOuterClass;
 import POGOProtos.Networking.Responses.FortDetailsResponseOuterClass;
-
 import com.google.protobuf.ProtocolStringList;
 
 import java.util.List;
diff --git a/library/src/main/java/com/pokegoapi/api/map/pokemon/EvolutionResult.java b/library/src/main/java/com/pokegoapi/api/map/pokemon/EvolutionResult.java
@@ -16,7 +16,6 @@
 package com.pokegoapi.api.map.pokemon;
 
 import POGOProtos.Networking.Responses.EvolvePokemonResponseOuterClass;
-
 import com.pokegoapi.api.PokemonGo;
 import com.pokegoapi.api.pokemon.Pokemon;
 
diff --git a/library/src/main/java/com/pokegoapi/api/player/PlayerProfile.java b/library/src/main/java/com/pokegoapi/api/player/PlayerProfile.java
@@ -56,12 +56,7 @@
 import lombok.Getter;
 
 import java.security.SecureRandom;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 
 public class PlayerProfile {
 	private static final String TAG = PlayerProfile.class.getSimpleName();
diff --git a/library/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java b/library/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java
@@ -39,9 +39,9 @@
 import com.pokegoapi.api.inventory.Item;
 import com.pokegoapi.api.map.pokemon.EvolutionResult;
 import com.pokegoapi.api.player.PlayerProfile;
+import com.pokegoapi.api.settings.templates.ItemTemplates;
 import com.pokegoapi.exceptions.NoSuchItemException;
 import com.pokegoapi.exceptions.request.RequestFailedException;
-import com.pokegoapi.api.settings.templates.ItemTemplates;
 import com.pokegoapi.main.ServerRequest;
 import com.pokegoapi.util.AsyncHelper;
 import lombok.Getter;
diff --git a/library/src/main/java/com/pokegoapi/api/settings/templates/FileTemplateProvider.java b/library/src/main/java/com/pokegoapi/api/settings/templates/FileTemplateProvider.java
@@ -18,12 +18,7 @@
 import POGOProtos.Networking.Responses.DownloadItemTemplatesResponseOuterClass.DownloadItemTemplatesResponse;
 import POGOProtos.Networking.Responses.DownloadItemTemplatesResponseOuterClass.DownloadItemTemplatesResponse.ItemTemplate;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/library/src/main/java/com/pokegoapi/auth/GoogleAuthJson.java b/library/src/main/java/com/pokegoapi/auth/GoogleAuthJson.java
@@ -16,7 +16,6 @@
 package com.pokegoapi.auth;
 
 import com.squareup.moshi.Json;
-
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/library/src/main/java/com/pokegoapi/auth/GoogleAuthTokenJson.java b/library/src/main/java/com/pokegoapi/auth/GoogleAuthTokenJson.java
@@ -16,7 +16,6 @@
 package com.pokegoapi.auth;
 
 import com.squareup.moshi.Json;
-
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/library/src/main/java/com/pokegoapi/auth/GoogleCredentialProvider.java b/library/src/main/java/com/pokegoapi/auth/GoogleCredentialProvider.java
@@ -21,11 +21,7 @@
 import com.pokegoapi.util.Log;
 import com.squareup.moshi.Moshi;
 import lombok.Getter;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
+import okhttp3.*;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
diff --git a/library/src/main/java/com/pokegoapi/auth/GoogleUserCredentialProvider.java b/library/src/main/java/com/pokegoapi/auth/GoogleUserCredentialProvider.java
@@ -23,11 +23,7 @@
 import com.pokegoapi.util.Time;
 import com.squareup.moshi.Moshi;
 import lombok.Getter;
-import okhttp3.HttpUrl;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
+import okhttp3.*;
 
 import java.io.IOException;
 
diff --git a/library/src/main/java/com/pokegoapi/auth/PtcCredentialProvider.java b/library/src/main/java/com/pokegoapi/auth/PtcCredentialProvider.java
@@ -22,15 +22,8 @@
 import com.pokegoapi.util.Time;
 import com.squareup.moshi.Moshi;
 import lombok.Setter;
-import okhttp3.Cookie;
-import okhttp3.CookieJar;
-import okhttp3.FormBody;
+import okhttp3.*;
 import okhttp3.FormBody.Builder;
-import okhttp3.HttpUrl;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 
 import java.io.IOException;
 import java.security.SecureRandom;
diff --git a/library/src/main/java/com/pokegoapi/main/RequestHandler.java b/library/src/main/java/com/pokegoapi/main/RequestHandler.java
@@ -30,11 +30,7 @@
 import com.pokegoapi.api.PokemonGo;
 import com.pokegoapi.api.listener.RequestInterceptor;
 import com.pokegoapi.exceptions.AsyncPokemonGoException;
-import com.pokegoapi.exceptions.request.BadRequestException;
-import com.pokegoapi.exceptions.request.BannedException;
-import com.pokegoapi.exceptions.request.InvalidCredentialsException;
-import com.pokegoapi.exceptions.request.LoginFailedException;
-import com.pokegoapi.exceptions.request.RequestFailedException;
+import com.pokegoapi.exceptions.request.*;
 import com.pokegoapi.util.AsyncHelper;
 import com.pokegoapi.util.Log;
 import com.pokegoapi.util.Signature;
diff --git a/library/src/main/java/com/pokegoapi/main/ResultOrException.java b/library/src/main/java/com/pokegoapi/main/ResultOrException.java
@@ -16,7 +16,6 @@
 package com.pokegoapi.main;
 
 import com.google.protobuf.ByteString;
-
 import lombok.Getter;
 
 public class ResultOrException {
diff --git a/library/src/main/java/com/pokegoapi/util/BaseLogger.java b/library/src/main/java/com/pokegoapi/util/BaseLogger.java
@@ -17,12 +17,7 @@
 
 import com.pokegoapi.util.Log.Level;
 
-import static com.pokegoapi.util.Log.Level.DEBUG;
-import static com.pokegoapi.util.Log.Level.INFO;
-import static com.pokegoapi.util.Log.Level.VERBOSE;
-import static com.pokegoapi.util.Log.Level.WARN;
-import static com.pokegoapi.util.Log.Level.ERROR;
-import static com.pokegoapi.util.Log.Level.ASSERT;
+import static com.pokegoapi.util.Log.Level.*;
 
 
 /**
diff --git a/library/src/resources/protobuf b/library/src/resources/protobuf
@@ -1 +1 @@
-Subproject commit d61150be7a4dbec0c9b6ae7e9a166fdc9371cc65
+Subproject commit 30b0ca3457bd7fda3757779117839149b4dec5d1
diff --git a/sample/src/main/java/com/pokegoapi/examples/CatchPokemonAtAreaExample.java b/sample/src/main/java/com/pokegoapi/examples/CatchPokemonAtAreaExample.java
@@ -56,13 +56,7 @@
 import com.pokegoapi.util.path.Path;
 import okhttp3.OkHttpClient;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 
 public class CatchPokemonAtAreaExample {
 
diff --git a/sample/src/main/java/com/pokegoapi/examples/SolveCaptchaExample.java b/sample/src/main/java/com/pokegoapi/examples/SolveCaptchaExample.java
@@ -44,9 +44,7 @@
 import javafx.scene.web.WebView;
 import okhttp3.OkHttpClient;
 
-import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
+import javax.swing.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
