Skip to content

Commit 15aa4b2

Browse files
FurtifFurtif
committed
optimise update deps
1 parent 9f9a70a commit 15aa4b2

28 files changed

+29
-116
lines changed

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Aug 16 10:42:32 CEST 2016
1+
#Sat Sep 08 15:24:02 CEST 2018
22
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-3.0-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip

‎library/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ checkstyleMain.doLast {
9292

9393
dependencies {
9494
compile 'svarzee.gps:gpsoauth:0.3'
95-
compile 'com.squareup.okio:okio:1.9.0'
96-
compile 'com.squareup.moshi:moshi:1.2.0'
97-
compile 'com.annimon:stream:1.1.1'
98-
compile 'com.squareup.okhttp3:okhttp:3.4.1'
99-
compile 'com.google.protobuf:protobuf-java:3.5.1'
100-
compile 'io.reactivex:rxjava:1.1.8'
95+
compile 'com.squareup.okio:okio:2.0.0'
96+
compile 'com.squareup.moshi:moshi:1.6.0'
97+
compile 'com.annimon:stream:1.2.1'
98+
compile 'com.squareup.okhttp3:okhttp:3.11.0'
99+
compile 'com.google.protobuf:protobuf-java:3.6.1'
100+
compile 'io.reactivex:rxjava:1.3.4'
101101
compile 'net.jpountz.lz4:lz4:1.3.0'
102-
compileOnly 'org.projectlombok:lombok:1.16.10'
102+
compileOnly 'org.projectlombok:lombok:1.18.2'
103103
}
104104

105105
idea {

‎library/src/main/java/com/pokegoapi/api/PokemonGo.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@
4949
import com.pokegoapi.api.settings.templates.TempFileTemplateProvider;
5050
import com.pokegoapi.auth.CredentialProvider;
5151
import com.pokegoapi.exceptions.request.RequestFailedException;
52-
import com.pokegoapi.main.CommonRequests;
53-
import com.pokegoapi.main.Heartbeat;
54-
import com.pokegoapi.main.RequestHandler;
55-
import com.pokegoapi.main.ServerPlatformRequest;
56-
import com.pokegoapi.main.ServerRequest;
57-
import com.pokegoapi.main.ServerRequestEnvelope;
52+
import com.pokegoapi.main.*;
5853
import com.pokegoapi.util.ClientInterceptor;
5954
import com.pokegoapi.util.SystemTimeImpl;
6055
import com.pokegoapi.util.Time;
@@ -65,11 +60,7 @@
6560

6661
import java.io.IOException;
6762
import java.lang.reflect.Method;
68-
import java.util.ArrayList;
69-
import java.util.Collections;
70-
import java.util.List;
71-
import java.util.Random;
72-
import java.util.UUID;
63+
import java.util.*;
7364

7465

7566
public class PokemonGo {

‎library/src/main/java/com/pokegoapi/api/device/ActivityStatus.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515

1616
package com.pokegoapi.api.device;
1717

18+
import POGOProtos.Networking.Envelopes.SignatureOuterClass;
1819
import com.google.protobuf.ByteString;
1920
import com.pokegoapi.api.PokemonGo;
2021

2122
import java.util.Random;
2223

23-
import POGOProtos.Networking.Envelopes.SignatureOuterClass;
24-
2524
/**
2625
* Created by fabianterhorst on 22.08.16.
2726
*/

‎library/src/main/java/com/pokegoapi/api/gym/Battle.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,7 @@
3939
import lombok.Getter;
4040
import lombok.Setter;
4141

42-
import java.util.ArrayList;
43-
import java.util.Comparator;
44-
import java.util.HashMap;
45-
import java.util.HashSet;
46-
import java.util.List;
47-
import java.util.Map;
48-
import java.util.Queue;
49-
import java.util.Set;
42+
import java.util.*;
5043
import java.util.concurrent.LinkedBlockingDeque;
5144
import java.util.concurrent.PriorityBlockingQueue;
5245

‎library/src/main/java/com/pokegoapi/api/gym/Gym.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import POGOProtos.Networking.Requests.RequestTypeOuterClass.RequestType;
2828
import POGOProtos.Networking.Responses.FortDeployPokemonResponseOuterClass.FortDeployPokemonResponse;
2929
import POGOProtos.Networking.Responses.GymGetInfoResponseOuterClass.GymGetInfoResponse;
30-
3130
import com.google.protobuf.ByteString;
3231
import com.google.protobuf.InvalidProtocolBufferException;
3332
import com.pokegoapi.api.PokemonGo;

‎library/src/main/java/com/pokegoapi/api/inventory/Hatchery.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@
2727
import com.pokegoapi.main.ServerRequest;
2828
import lombok.Getter;
2929

30-
import java.util.ArrayList;
31-
import java.util.Collections;
32-
import java.util.HashSet;
33-
import java.util.List;
34-
import java.util.Set;
30+
import java.util.*;
3531

3632
public class Hatchery {
3733
@Getter

‎library/src/main/java/com/pokegoapi/api/inventory/Inventories.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,7 @@
3838
import com.pokegoapi.main.ServerRequest;
3939
import lombok.Getter;
4040

41-
import java.util.ArrayList;
42-
import java.util.Collections;
43-
import java.util.HashMap;
44-
import java.util.HashSet;
45-
import java.util.List;
46-
import java.util.Map;
47-
import java.util.Set;
41+
import java.util.*;
4842

4943

5044
public class Inventories {

‎library/src/main/java/com/pokegoapi/api/inventory/ItemBag.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@
3333
import com.pokegoapi.main.ServerRequest;
3434
import com.pokegoapi.util.Log;
3535

36-
import java.util.ArrayList;
37-
import java.util.Collection;
38-
import java.util.Collections;
39-
import java.util.HashMap;
40-
import java.util.List;
41-
import java.util.Map;
36+
import java.util.*;
4237

4338

4439
/**

‎library/src/main/java/com/pokegoapi/api/inventory/PokeBank.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,7 @@
3838
import com.pokegoapi.main.ServerResponse;
3939
import lombok.Getter;
4040

41-
import java.util.ArrayList;
42-
import java.util.Arrays;
43-
import java.util.Collections;
44-
import java.util.HashMap;
45-
import java.util.List;
46-
import java.util.Map;
41+
import java.util.*;
4742

4843
public class PokeBank {
4944
@Getter

‎library/src/main/java/com/pokegoapi/api/listener/PokestopListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.pokegoapi.api.listener;
22

3-
import com.pokegoapi.api.map.fort.PokestopLootResult;
43
import com.pokegoapi.api.map.fort.Fort;
4+
import com.pokegoapi.api.map.fort.PokestopLootResult;
55

66
/**
77
* Listener for all pokestop related events.

‎library/src/main/java/com/pokegoapi/api/map/Point.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
package com.pokegoapi.api.map;
1717

1818
import POGOProtos.Map.SpawnPointOuterClass;
19-
2019
import com.pokegoapi.util.MapPoint;
21-
2220
import lombok.Getter;
2321
import lombok.Setter;
2422

‎library/src/main/java/com/pokegoapi/api/map/fort/FortDetails.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import POGOProtos.Map.Fort.FortModifierOuterClass;
2020
import POGOProtos.Map.Fort.FortTypeOuterClass;
2121
import POGOProtos.Networking.Responses.FortDetailsResponseOuterClass;
22-
2322
import com.google.protobuf.ProtocolStringList;
2423

2524
import java.util.List;

‎library/src/main/java/com/pokegoapi/api/map/pokemon/EvolutionResult.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.pokegoapi.api.map.pokemon;
1717

1818
import POGOProtos.Networking.Responses.EvolvePokemonResponseOuterClass;
19-
2019
import com.pokegoapi.api.PokemonGo;
2120
import com.pokegoapi.api.pokemon.Pokemon;
2221

‎library/src/main/java/com/pokegoapi/api/player/PlayerProfile.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@
5656
import lombok.Getter;
5757

5858
import java.security.SecureRandom;
59-
import java.util.Collections;
60-
import java.util.EnumMap;
61-
import java.util.HashMap;
62-
import java.util.List;
63-
import java.util.Map;
64-
import java.util.Random;
59+
import java.util.*;
6560

6661
public class PlayerProfile {
6762
private static final String TAG = PlayerProfile.class.getSimpleName();

‎library/src/main/java/com/pokegoapi/api/pokemon/Pokemon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import com.pokegoapi.api.inventory.Item;
4040
import com.pokegoapi.api.map.pokemon.EvolutionResult;
4141
import com.pokegoapi.api.player.PlayerProfile;
42+
import com.pokegoapi.api.settings.templates.ItemTemplates;
4243
import com.pokegoapi.exceptions.NoSuchItemException;
4344
import com.pokegoapi.exceptions.request.RequestFailedException;
44-
import com.pokegoapi.api.settings.templates.ItemTemplates;
4545
import com.pokegoapi.main.ServerRequest;
4646
import com.pokegoapi.util.AsyncHelper;
4747
import lombok.Getter;

‎library/src/main/java/com/pokegoapi/api/settings/templates/FileTemplateProvider.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@
1818
import POGOProtos.Networking.Responses.DownloadItemTemplatesResponseOuterClass.DownloadItemTemplatesResponse;
1919
import POGOProtos.Networking.Responses.DownloadItemTemplatesResponseOuterClass.DownloadItemTemplatesResponse.ItemTemplate;
2020

21-
import java.io.DataInputStream;
22-
import java.io.DataOutputStream;
23-
import java.io.File;
24-
import java.io.FileInputStream;
25-
import java.io.FileOutputStream;
26-
import java.io.IOException;
21+
import java.io.*;
2722
import java.util.HashMap;
2823
import java.util.Map;
2924

‎library/src/main/java/com/pokegoapi/auth/GoogleAuthJson.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.pokegoapi.auth;
1717

1818
import com.squareup.moshi.Json;
19-
2019
import lombok.Getter;
2120
import lombok.Setter;
2221

‎library/src/main/java/com/pokegoapi/auth/GoogleAuthTokenJson.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.pokegoapi.auth;
1717

1818
import com.squareup.moshi.Json;
19-
2019
import lombok.Getter;
2120
import lombok.Setter;
2221

‎library/src/main/java/com/pokegoapi/auth/GoogleCredentialProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@
2121
import com.pokegoapi.util.Log;
2222
import com.squareup.moshi.Moshi;
2323
import lombok.Getter;
24-
import okhttp3.HttpUrl;
25-
import okhttp3.OkHttpClient;
26-
import okhttp3.Request;
27-
import okhttp3.RequestBody;
28-
import okhttp3.Response;
24+
import okhttp3.*;
2925

3026
import java.io.IOException;
3127
import java.net.URISyntaxException;

‎library/src/main/java/com/pokegoapi/auth/GoogleUserCredentialProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
import com.pokegoapi.util.Time;
2424
import com.squareup.moshi.Moshi;
2525
import lombok.Getter;
26-
import okhttp3.HttpUrl;
27-
import okhttp3.OkHttpClient;
28-
import okhttp3.Request;
29-
import okhttp3.RequestBody;
30-
import okhttp3.Response;
26+
import okhttp3.*;
3127

3228
import java.io.IOException;
3329

‎library/src/main/java/com/pokegoapi/auth/PtcCredentialProvider.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@
2222
import com.pokegoapi.util.Time;
2323
import com.squareup.moshi.Moshi;
2424
import lombok.Setter;
25-
import okhttp3.Cookie;
26-
import okhttp3.CookieJar;
27-
import okhttp3.FormBody;
25+
import okhttp3.*;
2826
import okhttp3.FormBody.Builder;
29-
import okhttp3.HttpUrl;
30-
import okhttp3.Interceptor;
31-
import okhttp3.OkHttpClient;
32-
import okhttp3.Request;
33-
import okhttp3.Response;
3427

3528
import java.io.IOException;
3629
import java.security.SecureRandom;

‎library/src/main/java/com/pokegoapi/main/RequestHandler.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@
3030
import com.pokegoapi.api.PokemonGo;
3131
import com.pokegoapi.api.listener.RequestInterceptor;
3232
import com.pokegoapi.exceptions.AsyncPokemonGoException;
33-
import com.pokegoapi.exceptions.request.BadRequestException;
34-
import com.pokegoapi.exceptions.request.BannedException;
35-
import com.pokegoapi.exceptions.request.InvalidCredentialsException;
36-
import com.pokegoapi.exceptions.request.LoginFailedException;
37-
import com.pokegoapi.exceptions.request.RequestFailedException;
33+
import com.pokegoapi.exceptions.request.*;
3834
import com.pokegoapi.util.AsyncHelper;
3935
import com.pokegoapi.util.Log;
4036
import com.pokegoapi.util.Signature;

‎library/src/main/java/com/pokegoapi/main/ResultOrException.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.pokegoapi.main;
1717

1818
import com.google.protobuf.ByteString;
19-
2019
import lombok.Getter;
2120

2221
public class ResultOrException {

‎library/src/main/java/com/pokegoapi/util/BaseLogger.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@
1717

1818
import com.pokegoapi.util.Log.Level;
1919

20-
import static com.pokegoapi.util.Log.Level.DEBUG;
21-
import static com.pokegoapi.util.Log.Level.INFO;
22-
import static com.pokegoapi.util.Log.Level.VERBOSE;
23-
import static com.pokegoapi.util.Log.Level.WARN;
24-
import static com.pokegoapi.util.Log.Level.ERROR;
25-
import static com.pokegoapi.util.Log.Level.ASSERT;
20+
import static com.pokegoapi.util.Log.Level.*;
2621

2722

2823
/**

‎library/src/resources/protobuf

‎sample/src/main/java/com/pokegoapi/examples/CatchPokemonAtAreaExample.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,7 @@
5656
import com.pokegoapi.util.path.Path;
5757
import okhttp3.OkHttpClient;
5858

59-
import java.util.ArrayList;
60-
import java.util.Collections;
61-
import java.util.Comparator;
62-
import java.util.List;
63-
import java.util.Locale;
64-
import java.util.Random;
65-
import java.util.Set;
59+
import java.util.*;
6660

6761
public class CatchPokemonAtAreaExample {
6862

‎sample/src/main/java/com/pokegoapi/examples/SolveCaptchaExample.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@
4444
import javafx.scene.web.WebView;
4545
import okhttp3.OkHttpClient;
4646

47-
import javax.swing.JFrame;
48-
import javax.swing.SwingUtilities;
49-
import javax.swing.WindowConstants;
47+
import javax.swing.*;
5048
import java.awt.event.WindowAdapter;
5149
import java.awt.event.WindowEvent;
5250

0 commit comments

Comments
 (0)