Skip to content

Commit d5a51c6

Browse files
committed
Revert "optimise update deps"
This reverts commit 15aa4b2.
1 parent 15aa4b2 commit d5a51c6

26 files changed

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

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,12 @@
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.*;
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;
5358
import com.pokegoapi.util.ClientInterceptor;
5459
import com.pokegoapi.util.SystemTimeImpl;
5560
import com.pokegoapi.util.Time;
@@ -60,7 +65,11 @@
6065

6166
import java.io.IOException;
6267
import java.lang.reflect.Method;
63-
import java.util.*;
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;
6473

6574

6675
public class PokemonGo {

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

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

1616
package com.pokegoapi.api.device;
1717

18-
import POGOProtos.Networking.Envelopes.SignatureOuterClass;
1918
import com.google.protobuf.ByteString;
2019
import com.pokegoapi.api.PokemonGo;
2120

2221
import java.util.Random;
2322

23+
import POGOProtos.Networking.Envelopes.SignatureOuterClass;
24+
2425
/**
2526
* Created by fabianterhorst on 22.08.16.
2627
*/

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

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

42-
import java.util.*;
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;
4350
import java.util.concurrent.LinkedBlockingDeque;
4451
import java.util.concurrent.PriorityBlockingQueue;
4552

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

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

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

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

30-
import java.util.*;
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;
3135

3236
public class Hatchery {
3337
@Getter

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

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

41-
import java.util.*;
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;
4248

4349

4450
public class Inventories {

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

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

36-
import java.util.*;
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;
3742

3843

3944
/**

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

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

41-
import java.util.*;
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;
4247

4348
public class PokeBank {
4449
@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.Fort;
43
import com.pokegoapi.api.map.fort.PokestopLootResult;
4+
import com.pokegoapi.api.map.fort.Fort;
55

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

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

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

1818
import POGOProtos.Map.SpawnPointOuterClass;
19+
1920
import com.pokegoapi.util.MapPoint;
21+
2022
import lombok.Getter;
2123
import lombok.Setter;
2224

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

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

2425
import java.util.List;

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

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

1818
import POGOProtos.Networking.Responses.EvolvePokemonResponseOuterClass;
19+
1920
import com.pokegoapi.api.PokemonGo;
2021
import com.pokegoapi.api.pokemon.Pokemon;
2122

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

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

5858
import java.security.SecureRandom;
59-
import java.util.*;
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;
6065

6166
public class PlayerProfile {
6267
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;
4342
import com.pokegoapi.exceptions.NoSuchItemException;
4443
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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
import POGOProtos.Networking.Responses.DownloadItemTemplatesResponseOuterClass.DownloadItemTemplatesResponse;
1919
import POGOProtos.Networking.Responses.DownloadItemTemplatesResponseOuterClass.DownloadItemTemplatesResponse.ItemTemplate;
2020

21-
import java.io.*;
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;
2227
import java.util.HashMap;
2328
import java.util.Map;
2429

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

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

1818
import com.squareup.moshi.Json;
19+
1920
import lombok.Getter;
2021
import lombok.Setter;
2122

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

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

1818
import com.squareup.moshi.Json;
19+
1920
import lombok.Getter;
2021
import lombok.Setter;
2122

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

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

2630
import java.io.IOException;
2731
import java.net.URISyntaxException;

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

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

2832
import java.io.IOException;
2933

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

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

2835
import java.io.IOException;
2936
import java.security.SecureRandom;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
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.*;
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;
3438
import com.pokegoapi.util.AsyncHelper;
3539
import com.pokegoapi.util.Log;
3640
import com.pokegoapi.util.Signature;

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

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

1818
import com.google.protobuf.ByteString;
19+
1920
import lombok.Getter;
2021

2122
public class ResultOrException {

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

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

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

20-
import static com.pokegoapi.util.Log.Level.*;
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;
2126

2227

2328
/**

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

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

59-
import java.util.*;
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;
6066

6167
public class CatchPokemonAtAreaExample {
6268

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

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

47-
import javax.swing.*;
47+
import javax.swing.JFrame;
48+
import javax.swing.SwingUtilities;
49+
import javax.swing.WindowConstants;
4850
import java.awt.event.WindowAdapter;
4951
import java.awt.event.WindowEvent;
5052

0 commit comments

Comments
 (0)