Skip to content

Commit 4b3a60a

Browse files
authored
Merge pull request #129 from pusher/ditch_clojars
Ditch clojars
2 parents 811394c + ac7c247 commit 4b3a60a

File tree

14 files changed

+133
-469
lines changed

14 files changed

+133
-469
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# pusher-websocket-java changelog
22

3-
## Version 1.3.0
3+
## Version 1.4.0
4+
* Update the dependency to use pusher/java-websocket fork and remove dependency on clojars.org repository.
45

6+
## Version 1.3.0
57
* Add retry logic when the connection is lost
68
* Accept 201 status code from auth endpoints
79

build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ buildscript {
66
classpath 'org.ajoberstar:gradle-git:1.1.0'
77
}
88
}
9+
910
def getProperty = { property ->
1011
if (!project.hasProperty(property)) {
1112
throw new GradleException("${property} property must be set")
1213
}
1314
return project.property(property)
1415
}
1516

16-
1717
apply plugin: 'java'
1818
apply plugin: 'maven'
1919
apply plugin: 'eclipse'
2020
apply plugin: 'org.ajoberstar.github-pages'
2121
apply plugin: 'signing'
2222

2323
group = "com.pusher"
24-
version = "1.3.0"
24+
version = "1.4.0"
2525
sourceCompatibility = "1.6"
2626
targetCompatibility = "1.6"
2727

@@ -39,13 +39,12 @@ ext.sharedManifest = manifest {
3939

4040
repositories {
4141
mavenCentral()
42-
maven { url "http://clojars.org/repo" }
4342
}
4443

4544
dependencies {
4645
compile "com.google.code.gson:gson:2.2.2"
4746
compile "org.slf4j:slf4j-api:1.7.5"
48-
compile "org.java-websocket:java-websocket:1.3.1"
47+
compile "com.pusher:java-websocket:1.4.1"
4948
testCompile "org.mockito:mockito-all:1.8.5"
5049
testCompile "org.powermock:powermock-module-junit4:1.4.11"
5150
testCompile "org.powermock:powermock-api-mockito:1.4.11"
@@ -186,5 +185,5 @@ task createPublishTarget << {
186185
}
187186

188187
task wrapper(type: Wrapper) {
189-
gradleVersion = '2.0'
188+
gradleVersion = '2.14.1'
190189
}

gradle/wrapper/gradle-wrapper.jar

1.16 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 04 21:36:52 GMT 2015
1+
#Tue Nov 15 11:59:30 GMT 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-2.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

gradlew

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 90 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)