Upgrade to Gradle 7.2 and RxJava 3.1.1

Author: akarnokd

build.gradle

@@ -10,12 +10,12 @@ buildscript {
         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 "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0"
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0'
+        classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1"
     }
 }
 
-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.rxjava3:rxjava:3.1.0"
+    api "org.reactivestreams:reactive-streams:1.0.3"
+    api "io.reactivex.rxjava3:rxjava:3.1.1"
 
-    testCompile group: 'junit', name: 'junit', version: '4.13.2'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 
-    testCompile 'org.mockito:mockito-core:3.12.4'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
 }
 
-apply plugin: 'maven'
-
 apply plugin: 'biz.aQute.bnd.builder'
 
 jar {

gradle.properties

@@ -1,6 +1,6 @@
 GROUP=com.github.akarnokd
-VERSION_NAME=3.0.1
-version=3.0.1
+VERSION_NAME=3.1.1
+version=3.1.1
 
 POM_ARTIFACT_ID=rxjava3-extensions
 POM_NAME=RxJava 3 extra sources, operators and components

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/main/java/hu/akarnokd/rxjava3/basetypes/BasicEmptyQueueSubscription.java

@@ -16,7 +16,7 @@
 
 package hu.akarnokd.rxjava3.basetypes;
 
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Base class for empty, async-fuseable intermediate operators.

src/main/java/hu/akarnokd/rxjava3/basetypes/BasicNonoIntQueueSubscription.java

@@ -18,7 +18,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Base class for atomic integer, async-fuseable intermediate operators.

src/main/java/hu/akarnokd/rxjava3/basetypes/BasicRefQueueSubscription.java

@@ -18,7 +18,7 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Base class extending AtomicReference (resource tracking) and QueueSubscription (fusion).

src/main/java/hu/akarnokd/rxjava3/basetypes/BasicSoloQueueSubscription.java

@@ -16,7 +16,7 @@
 
 package hu.akarnokd.rxjava3.basetypes;
 
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Base class that defaults the offer() methods of QueueSubscription.

src/main/java/hu/akarnokd/rxjava3/basetypes/NonoConcat.java

@@ -21,8 +21,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.*;
+import io.reactivex.rxjava3.operators.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
 

src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsDoOnLifecycle.java

@@ -20,7 +20,7 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 

src/main/java/hu/akarnokd/rxjava3/basetypes/PerhapsJust.java

@@ -18,7 +18,7 @@
 
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription;
 
 /**