Merge branch 'ReactiveX:3.x' into 3.x

sakibguy · web-flow · commit bba190e952f3 · 2021-10-06T17:57:21.000+06:00
diff --git a/README.md b/README.md
@@ -526,7 +526,7 @@ APIs marked with the [`@Experimental`][experimental source link] annotation at t
 
 #### @Deprecated
 
-APIs marked with the `@Deprecated` annotation at the class or method level will remain supported until the next major release but it is recommended to stop using them. 
+APIs marked with the `@Deprecated` annotation at the class or method level will remain supported until the next major release, but it is recommended to stop using them. 
 
 #### io.reactivex.rxjava3.internal.*
 
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.5.3"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "5.3.0"
+    id("biz.aQute.bnd.builder") version "6.0.0"
     id("com.vanniktech.maven.publish") version "0.18.0"
     id("org.beryx.jar") version "1.2.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`id("ru.vyarus.animalsniffer") version "1.5.3"`
`8`	`8`	`id("me.champeau.gradle.jmh") version "0.5.3"`
`9`	`9`	`id("com.github.hierynomus.license") version "0.16.1"`
`10`		`- id("biz.aQute.bnd.builder") version "5.3.0"`
	`10`	`+ id("biz.aQute.bnd.builder") version "6.0.0"`
`11`	`11`	`id("com.vanniktech.maven.publish") version "0.18.0"`
`12`	`12`	`id("org.beryx.jar") version "1.2.0"`
`13`	`13`	`}`