diff --git a/pom.xml b/pom.xml
index 2c43ce92..013dde90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
 
         <rxjava.version>2.2.21</rxjava.version>
         <reactor.version>3.4.7</reactor.version>
-        <rx3java.version>3.0.5</rx3java.version>
+        <rx3java.version>3.1.1</rx3java.version>
 
         <!-- Test Dependency Versions -->
         <grpc.contrib.version>0.8.1</grpc.contrib.version>
diff --git a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/FusionAwareQueueSubscriptionAdapter.java b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/FusionAwareQueueSubscriptionAdapter.java
index 182c4926..5bddcbd4 100644
--- a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/FusionAwareQueueSubscriptionAdapter.java
+++ b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/FusionAwareQueueSubscriptionAdapter.java
@@ -10,7 +10,7 @@
 import com.salesforce.reactivegrpc.common.FusionModeAwareSubscription;
 
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Implementation of FusionModeAwareSubscription which encapsulate
diff --git a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxClientStreamObserverAndPublisher.java b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxClientStreamObserverAndPublisher.java
index ad934d88..4787b8b6 100644
--- a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxClientStreamObserverAndPublisher.java
+++ b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxClientStreamObserverAndPublisher.java
@@ -11,9 +11,9 @@
 import com.salesforce.reactivegrpc.common.Consumer;
 
 import io.grpc.stub.CallStreamObserver;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 /**
  * TODO: Explain what this class does.
diff --git a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxServerStreamObserverAndPublisher.java b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxServerStreamObserverAndPublisher.java
index 40f8238a..be311624 100644
--- a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxServerStreamObserverAndPublisher.java
+++ b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxServerStreamObserverAndPublisher.java
@@ -12,9 +12,9 @@
 
 import io.grpc.stub.CallStreamObserver;
 import io.grpc.stub.ServerCallStreamObserver;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 /**
  * TODO: Explain what this class does.
diff --git a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndClientProducer.java b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndClientProducer.java
index 393e370c..fe2b04be 100644
--- a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndClientProducer.java
+++ b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndClientProducer.java
@@ -12,7 +12,7 @@
 import com.salesforce.reactivegrpc.common.AbstractSubscriberAndClientProducer;
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * The gRPC client-side implementation of {@link com.salesforce.reactivegrpc.common.AbstractSubscriberAndProducer}.
diff --git a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndServerProducer.java b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndServerProducer.java
index c3d5ade0..88ef0303 100644
--- a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndServerProducer.java
+++ b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/RxSubscriberAndServerProducer.java
@@ -12,7 +12,7 @@
 import com.salesforce.reactivegrpc.common.AbstractSubscriberAndServerProducer;
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * The gRPC server-side implementation of {@link com.salesforce.reactivegrpc.common.AbstractSubscriberAndProducer}.
diff --git a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/SimpleQueueAdapter.java b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/SimpleQueueAdapter.java
index 2c5eeb8a..e50b354c 100644
--- a/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/SimpleQueueAdapter.java
+++ b/rx3-java/rx3grpc-stub/src/main/java/com/salesforce/rx3grpc/stub/SimpleQueueAdapter.java
@@ -8,7 +8,7 @@
 
 import com.salesforce.reactivegrpc.common.AbstractUnimplementedQueue;
 
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 
 /**
  * Adapts the RxJava {@code SimpleQueue} interface to a common java {@link java.util.Queue}.
diff --git a/rx3-java/rx3grpc-stub/src/test/java/com/salesforce/rx3grpc/stub/RetryWhen.java b/rx3-java/rx3grpc-stub/src/test/java/com/salesforce/rx3grpc/stub/RetryWhen.java
index 18c206e2..79d5d3df 100644
--- a/rx3-java/rx3grpc-stub/src/test/java/com/salesforce/rx3grpc/stub/RetryWhen.java
+++ b/rx3-java/rx3grpc-stub/src/test/java/com/salesforce/rx3grpc/stub/RetryWhen.java
@@ -14,7 +14,6 @@
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 /**
@@ -198,9 +197,15 @@ public static Builder exponentialBackoff(long firstDelay, TimeUnit unit) {
 
     public static final class Builder {
 
+        static final class TruePredicate implements Predicate<Object> {
+            @Override
+            public boolean test(Object o) {
+                return true;
+            }
+        }
         private final List<Class<? extends Throwable>> retryExceptions = new ArrayList<Class<? extends Throwable>>();
         private final List<Class<? extends Throwable>> failExceptions = new ArrayList<Class<? extends Throwable>>();
-        private Predicate<? super Throwable> exceptionPredicate = Functions.alwaysTrue();
+        private Predicate<? super Throwable> exceptionPredicate = new TruePredicate();
 
         private Flowable<Long> delays = Flowable.just(0L).repeat();
         private Optional<Integer> maxRetries = Optional.absent();