Skip to content

Commit a2828da

Browse files
vmarchaudGrover-c13
authored andcommitted
modify build process to generate javadoc and one bundled jar + fix checkstyle (#307)
1 parent efd2f85 commit a2828da

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ buildscript {
88
dependencies {
99
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.7'
1010
}
11-
12-
1311
}
1412

1513
apply plugin: 'idea'
@@ -45,8 +43,6 @@ processResources {
4543

4644
// Run this task to bundle all needed dependency
4745
task bundle(type: Jar) {
48-
baseName = project.name + '_bundle'
49-
5046
from {
5147
configurations.compile.collect {
5248
it.isDirectory() && !it.isEmpty() ? it : zipTree(it)
@@ -55,6 +51,8 @@ task bundle(type: Jar) {
5551
with jar
5652
}
5753

54+
build.finalizedBy(bundle)
55+
5856
protobuf {
5957
// Configure the protoc executable
6058
protoc {
@@ -114,11 +112,19 @@ idea {
114112
}
115113
}
116114

117-
task sourcesJar(type: Jar) {
118-
from sourceSets.main.java.srcDirs
115+
task sourcesJar(type: Jar, dependsOn: classes) {
119116
classifier = 'sources'
117+
from sourceSets.main.allJava
118+
}
119+
120+
task javadocJar(type: Jar, dependsOn: javadoc) {
121+
classifier = 'javadoc'
122+
javadoc.failOnError(false);
123+
javadoc.source = sourceSets.main.allJava
124+
from javadoc.destinationDir
120125
}
121126

122127
artifacts {
123128
archives sourcesJar
129+
archives javadocJar
124130
}

src/main/java/com/pokegoapi/auth/GoogleAutoCredentialProvider.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public GoogleAutoCredentialProvider(OkHttpClient httpClient, String username, St
4646
}
4747

4848
/**
49-
* Constructs credential provider using username and password
50-
*
51-
* @param username - google username
52-
* @param password - google password
53-
* @param Time - time object
54-
* @throws LoginFailedException - login failed possibly due to invalid credentials
49+
*
50+
* @param httpClient : the client that will make http call
51+
* @param username : google username
52+
* @param password : google pwd
53+
* @param time : time instance used to refresh token
54+
* @throws LoginFailedException - login failed possibly due to invalid credentials
5555
* @throws RemoteServerException - some server/network failure
5656
*/
5757
public GoogleAutoCredentialProvider(OkHttpClient httpClient, String username, String password, Time time)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public class GoogleCredentialProvider extends CredentialProvider {
5757

5858
/**
5959
* Used for logging in when one has a persisted refreshToken.
60-
* Deprecated: specify a Time implementation
6160
*
6261
* @param client OkHttp client
6362
* @param refreshToken Refresh Token Persisted by user

0 commit comments

Comments
 (0)