Skip to content

Correct javadoc and sources #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 22, 2018
Merged

Correct javadoc and sources #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faafba0
Flip javadoc and sources exporting
zmarkan Jan 5, 2018
6783882
Merge branch 'master' of github.com:pusher/pusher-websocket-java into…
zmarkan Jan 5, 2018
286ee3b
Update versions and fix the github links in the maven archive
zmarkan Jan 5, 2018
ce4889c
Bump version to 1.6.2-SNAPSHOT
zmarkan Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ The pusher-java-client is available in Maven Central.
<dependency>
<groupId>com.pusher</groupId>
<artifactId>pusher-java-client</artifactId>
<version>1.6.0</version>
<version>1.6.1</version>
</dependency>
</dependencies>
```
Expand All @@ -60,7 +60,7 @@ The pusher-java-client is available in Maven Central.

```groovy
dependencies {
compile 'com.pusher:pusher-java-client:1.6.0'
compile 'com.pusher:pusher-java-client:1.6.1'
}
```

Expand Down
18 changes: 8 additions & 10 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apply plugin: 'org.ajoberstar.github-pages'
apply plugin: 'signing'

group = "com.pusher"
version = "1.6.1-SNAPSHOT"
version = "1.6.2-SNAPSHOT"
sourceCompatibility = "1.6"
targetCompatibility = "1.6"

Expand Down Expand Up @@ -94,15 +94,13 @@ assemble.dependsOn fatJar
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
classifier = 'javadoc'
}
assemble.dependsOn sourcesJar


task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
classifier = 'sources'
}
assemble.dependsOn javadocJar

Expand Down Expand Up @@ -151,17 +149,17 @@ task createPublishTarget << {
packaging 'jar'
artifactId 'pusher-java-client'
description 'This is a Java client library for Pusher, targeted at core Java and Android.'
url 'http://github.com/pusher/pusher-java-client'
url 'http://github.com/pusher/pusher-websocket-java'
scm {
connection 'scm:git:[email protected]:pusher/pusher-java-client'
developerConnection 'scm:git:[email protected]:pusher/pusher-java-client'
url 'http://github.com/pusher/pusher-java-client'
connection 'scm:git:[email protected]:pusher/pusher-websocket-java'
developerConnection 'scm:git:[email protected]:pusher/pusher-websocket-java'
url 'http://github.com/pusher/pusher-websocket-java'
}
licenses {
license {
name 'MIT'
url 'https://raw.github.com/pusher/pusher-java-client/master/LICENCE.txt'
distribution 'https://raw.github.com/pusher/pusher-java-client/mvn-repo/'
url 'https://raw.github.com/pusher/pusher-websocket-java/master/LICENCE.txt'
distribution 'https://raw.github.com/pusher/pusher-websocket-java/mvn-repo/'
}
}
organization {
Expand All @@ -170,7 +168,7 @@ task createPublishTarget << {
}
issueManagement {
system 'GitHub'
url 'https://github.com/pusher/pusher-java-client/issues'
url 'https://github.com/pusher/pusher-websocket-java/issues'
}
developers {
developer {
Expand Down