Upgrade to RxJava 3.1.1 and Gradle 7.2

build.gradle

@@ -7,15 +7,15 @@ buildscript {
     }
 
     dependencies {
-        classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0"
+        classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1"
         classpath "me.champeau.gradle:jmh-gradle-plugin:0.5.3"
         classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.3'
         classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0"
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0'
     }
 }
 
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'eclipse'
 apply plugin: "me.champeau.gradle.jmh"
 apply plugin: 'pmd'
@@ -39,23 +39,20 @@ repositories {
     mavenCentral()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     maven { url 'https://oss.sonatype.org/content/groups/public' }
-    maven { url 'https://oss.jfrog.org/libs-snapshot' }
     maven { url 'https://repo.spring.io/libs-snapshot' }
 }
 
 dependencies {
     signature 'org.codehaus.mojo.signature:java18:1.0@signature'
 
-    compile "org.reactivestreams:reactive-streams:1.0.3"
-    compile "io.reactivex:rxjava:1.3.8"
-    compile "io.reactivex.rxjava3:rxjava:3.1.0"
+    api "org.reactivestreams:reactive-streams:1.0.3"
+    api "io.reactivex:rxjava:1.3.8"
+    api "io.reactivex.rxjava3:rxjava:3.1.1"
 
-    testCompile group: 'junit', name: 'junit', version: '4.13.2'
-    testCompile 'org.mockito:mockito-core:3.12.4'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
 }
 
-apply plugin: 'maven'
-
 apply plugin: 'biz.aQute.bnd.builder'
 
 jar {
@@ -126,7 +123,7 @@ build.dependsOn jacocoTestReport
 check.dependsOn jacocoTestReport
 
 pmd {
-    toolVersion = '5.4.2'
+    toolVersion = '6.21.0'
     ignoreFailures = true
     sourceSets = [sourceSets.main]
     ruleSets = []

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.github.akarnokd
-VERSION_NAME=3.0.2
-version=3.0.2
+VERSION_NAME=3.1.1
+version=3.1.1
 
 POM_ARTIFACT_ID=rxjava3-interop
 POM_NAME=Interop library between RxJava 1.x and 3.x

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/test/java/hu/akarnokd/rxjava3/interop/TestHelper.java

@@ -40,7 +40,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.operators.*;
 import io.reactivex.rxjava3.internal.operators.completable.CompletableToFlowable;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
 import io.reactivex.rxjava3.internal.operators.single.SingleToFlowable;