Skip to content

Commit 005ae7c

Browse files
rdegnanrdegnan
committed
Consolidate java implementations
1 parent 568edf0 commit 005ae7c

64 files changed

Lines changed: 2629 additions & 42 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@ subprojects {
1717
compile 'io.reactivex:rxjava:1.1.1'
1818
compile 'io.reactivex:rxjava-reactive-streams:1.0.1'
1919
compile 'io.reactivesocket:reactivesocket:0.0.2'
20-
compile 'uk.co.real-logic:Agrona:0.4.8'
21-
compile 'uk.co.real-logic:aeron-all:0.2.2'
2220
compile 'org.hdrhistogram:HdrHistogram:2.1.7'
2321
compile 'org.slf4j:slf4j-api:1.7.12'
24-
testCompile 'junit:junit-dep:4.10'
22+
testCompile 'junit:junit:4.12'
2523
testCompile 'org.mockito:mockito-core:1.8.5'
26-
testCompile 'org.slf4j:slf4j-simple:1.7.12'
24+
testRuntime 'org.slf4j:slf4j-simple:1.7.12'
2725
}
2826

2927
// support for snapshot/final releases via versioned branch names like 1.x

‎reactivesocket-aeron-client/build.gradle‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎reactivesocket-aeron-core/build.gradle‎

Whitespace-only changes.

‎reactivesocket-aeron-core/src/main/java/io/reactivesocket/aeron/internal/TimedOutException.java‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎reactivesocket-aeron-examples/build.gradle‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎reactivesocket-aeron-server/build.gradle‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎reactivesocket-aeron-tests/build.gradle‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎reactivesocket-aeron-tests/src/main/java/package-info.java‎

Whitespace-only changes.

‎reactivesocket-aeron/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dependencies {
2+
compile 'uk.co.real-logic:Agrona:0.4.8'
3+
compile 'uk.co.real-logic:aeron-all:0.2.2'
4+
}

reactivesocket-aeron-examples/src/main/java/io/reactivesocket/aeron/example/MediaDriver.java renamed to reactivesocket-aeron/src/examples/java/io/reactivesocket/aeron/example/MediaDriver.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
import uk.co.real_logic.agrona.concurrent.BackoffIdleStrategy;
2020
import uk.co.real_logic.agrona.concurrent.NoOpIdleStrategy;
2121

22-
/**
23-
* Created by rroeser on 8/16/15.
24-
*/
2522
public class MediaDriver {
2623
public static void main(String... args) {
2724
ThreadingMode threadingMode = ThreadingMode.SHARED;

0 commit comments

Comments
 (0)