diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index 729b0dd..a5475f9 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -15,7 +15,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -25,7 +25,7 @@ jobs: - name: Setup JDK id: setup-java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'adopt' java-version: '8' diff --git a/gradle.properties b/gradle.properties index 96d1277..98d1bf9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ publisher.image=ghcr.io/deephaven-examples/crypto-application-publisher:edge client.base=docker.io/openjdk:11-slim-buster client.image=ghcr.io/deephaven-examples/crypto-application-client:edge -redpanda.base=docker.vectorized.io/vectorized/redpanda:v21.11.14 +redpanda.base=docker.io/redpandadata/redpanda:v25.2.2 redpanda.image=ghcr.io/deephaven-examples/crypto-application-redpanda:edge maintainer=devinsmith@deephaven.io diff --git a/publisher/build.gradle b/publisher/build.gradle index fdcb1b0..cd2e832 100644 --- a/publisher/build.gradle +++ b/publisher/build.gradle @@ -19,6 +19,7 @@ String image = project.property('publisher.image') dependencies { implementation 'org.apache.kafka:kafka-clients:7.0.1-ccs' implementation 'io.confluent:kafka-avro-serializer:7.0.1' + implementation 'io.reactivex.rxjava3:rxjava:3.1.8' // Add RxJava 3 dependency implementation project(':common') implementation project(':schemas') diff --git a/publisher/src/main/java/io/deephaven/crypto/kafka/QuotesPublisher.java b/publisher/src/main/java/io/deephaven/crypto/kafka/QuotesPublisher.java index dc91a9c..dad409c 100644 --- a/publisher/src/main/java/io/deephaven/crypto/kafka/QuotesPublisher.java +++ b/publisher/src/main/java/io/deephaven/crypto/kafka/QuotesPublisher.java @@ -1,8 +1,8 @@ package io.deephaven.crypto.kafka; import io.deephaven.crypto.Quote; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; import java.util.Objects; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.KafkaProducer; diff --git a/publisher/src/main/java/io/deephaven/crypto/kafka/TradesPublisher.java b/publisher/src/main/java/io/deephaven/crypto/kafka/TradesPublisher.java index 0cadbee..575bdd7 100644 --- a/publisher/src/main/java/io/deephaven/crypto/kafka/TradesPublisher.java +++ b/publisher/src/main/java/io/deephaven/crypto/kafka/TradesPublisher.java @@ -1,8 +1,8 @@ package io.deephaven.crypto.kafka; import io.deephaven.crypto.Trade; -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; +import io.reactivex.rxjava3.core.Observer; +import io.reactivex.rxjava3.disposables.Disposable; import java.util.Objects; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.KafkaProducer; diff --git a/settings.gradle b/settings.gradle index 34b54c9..757461e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,8 @@ include('web') include('client') -[ 'binance', 'bitfinex', 'bitflyer', 'bitstamp', 'coinbase-pro', 'gemini', 'kraken', 'lgo', 'okcoin', 'okex', 'poloniex' ].each { String exchangeName -> +// Removed 'lgo' and 'okex' due to missing dependencies +[ 'binance', 'bitfinex', 'bitflyer', 'bitstamp', 'coinbase-pro', 'gemini', 'kraken', 'okcoin', 'poloniex' ].each { String exchangeName -> include(":${exchangeName}") project(":${exchangeName}").projectDir = file("exchanges/${exchangeName}") } diff --git a/xchange-adapter/build.gradle b/xchange-adapter/build.gradle index 4b05cf6..df679dc 100644 --- a/xchange-adapter/build.gradle +++ b/xchange-adapter/build.gradle @@ -6,7 +6,8 @@ dependencies { api project(':schemas') api 'org.knowm.xchange:xchange-core:5.2.2' api 'org.knowm.xchange:xchange-stream-core:5.2.2' - + api 'io.reactivex.rxjava3:rxjava:3.1.8' // Using RxJava 3 to match xchange-stream-core + annotationProcessor 'org.immutables:value:2.8.8' compileOnly 'org.immutables:value-annotations:2.8.8' } \ No newline at end of file diff --git a/xchange-adapter/src/main/java/io/deephaven/crypto/Entrypoint.java b/xchange-adapter/src/main/java/io/deephaven/crypto/Entrypoint.java index 821dddd..50045a8 100644 --- a/xchange-adapter/src/main/java/io/deephaven/crypto/Entrypoint.java +++ b/xchange-adapter/src/main/java/io/deephaven/crypto/Entrypoint.java @@ -4,7 +4,7 @@ import info.bitrich.xchangestream.core.ProductSubscription.ProductSubscriptionBuilder; import info.bitrich.xchangestream.core.StreamingExchange; import info.bitrich.xchangestream.core.StreamingExchangeFactory; -import io.reactivex.Observer; +import io.reactivex.rxjava3.core.Observer; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit;