Skip to content

Switch back to non-forked version of java-websocket #214

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 1 commit into from
Aug 9, 2019
Merged

Switch back to non-forked version of java-websocket #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ repositories {

dependencies {
compile "com.google.code.gson:gson:2.2.2"
compile "com.pusher:java-websocket:1.4.1"
compile "org.java-websocket:Java-WebSocket:1.4.0"
testCompile "org.mockito:mockito-all:1.8.5"
testCompile "org.powermock:powermock-module-junit4:1.4.11"
testCompile "org.powermock:powermock-api-mockito:1.4.11"
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocketFactory;

import com.pusher.java_websocket.client.WebSocketClient;
import com.pusher.java_websocket.handshake.ServerHandshake;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;

/**
* A thin wrapper around the WebSocketClient class from the Java-WebSocket
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import javax.net.ssl.SSLException;

import com.pusher.java_websocket.handshake.ServerHandshake;
import org.java_websocket.handshake.ServerHandshake;

import com.google.gson.Gson;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pusher/client/connection/websocket/WebSocketListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.pusher.client.connection.websocket;

import com.pusher.java_websocket.handshake.ServerHandshake;
import org.java_websocket.handshake.ServerHandshake;

public interface WebSocketListener {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/pusher/client/example/SimpleWebSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.net.URI;
import java.net.URISyntaxException;

import com.pusher.java_websocket.client.WebSocketClient;
import com.pusher.java_websocket.handshake.ServerHandshake;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;

public class SimpleWebSocket extends WebSocketClient {
public static void main(final String[] args) throws URISyntaxException {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/pusher/client/EndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import com.pusher.client.connection.websocket.WebSocketListener;
import com.pusher.client.util.DoNothingExecutor;
import com.pusher.client.util.Factory;
import com.pusher.java_websocket.handshake.ServerHandshake;
import org.java_websocket.handshake.ServerHandshake;

@RunWith(MockitoJUnitRunner.class)
public class EndToEndTest {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/pusher/client/connection/websocket/WebSocketClientWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import javax.net.ssl.SSLException;

import com.pusher.java_websocket.handshake.ServerHandshake;
import org.java_websocket.handshake.ServerHandshake;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down