From ab7f36fd347f117a0f78e03dd871b0d8cf34e88d Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 6 Sep 2021 10:35:57 +0200
Subject: [PATCH 1/3] 3.x: Inject prebuilt module-info.class for Module support

---
 .gitignore                                        |   1 +
 build.gradle                                      |   1 +
 .../META-INF/versions/9/module-info.class         | Bin 0 -> 780 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 src/main/resources/META-INF/versions/9/module-info.class

diff --git a/.gitignore b/.gitignore
index b60171cf2d..a154de3e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.exe
 *.o
 *.so
+!src/main/resources/META-INF/versions/9/module-info.class
 
 # Packages #
 ############
diff --git a/build.gradle b/build.gradle
index 3a87a423e1..403c0930a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -86,6 +86,7 @@ animalsniffer {
 }
 
 jar {
+    bnd('-fixupmessages': '^Classes found in the wrong directory: \\\\{META-INF/versions/9/module-info\\\\.class=module-info}$')
     bnd(
             "Bundle-Name": "rxjava",
             "Bundle-Vendor": "RxJava Contributors",
diff --git a/src/main/resources/META-INF/versions/9/module-info.class b/src/main/resources/META-INF/versions/9/module-info.class
new file mode 100644
index 0000000000000000000000000000000000000000..ae567b76203853341fae1b4efdab23bd29013858
GIT binary patch
literal 780
zcmaKqNm9cw5JkVj5J(sTZiX-=%xp*&6jxx!iWA620a3<sNp{FG=VHMDI2484Nu^jQ
zXz?`t{@tz8_s{1SfP383u`AGcGNnz_gHDw|>)kw;sk+tK!1UhaPzo$R@==7n2>TJ*
zgag7M;fQcdI3aWhUBW5hjBrl4AY2lz2-gD5KXwA7P0uQs6ndyeJv*xW?*vw>xfe_4
z^GC+M%rvg>>USs5)uulS>`w#xGRsUM3vDtlX$K{VvEDQs{;XYYoQzZD!#lxnHA+-I
zO>h!a3{vwkwU{F)Gv6<l7%s!aPTAqV9utYOzRu%d6}hxBO;svz6uwW(7hSzlxXs*}
zL^)@w1Yw0sURCuk=9l2g_)R5+cL=xX?_FYb>@CKC@c(ZzYN+`|4GUQGbB-lGu3>px
lE$ZlcZeXR_V3pZmHkoV8b>;?hli6Z!F}Il!lbAb9#xLFg)V}}#

literal 0
HcmV?d00001


From d88f2c988e2bc7364cebbae98ba61f00d6530125 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 6 Sep 2021 10:45:41 +0200
Subject: [PATCH 2/3] Add missing operators export

---
 .../META-INF/versions/9/module-info.class       | Bin 780 -> 822 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/META-INF/versions/9/module-info.class b/src/main/resources/META-INF/versions/9/module-info.class
index ae567b76203853341fae1b4efdab23bd29013858..67f1cf163d2be53abf9912fa860e814aa75d7c36 100644
GIT binary patch
delta 103
zcmeBS+s4Lw>ff$?3=9mW3|j0A;uCqbStW!SB!wqBXtIegXoxUqZp;j3WR#oiz$D6^
wUyxdqSdu^4nn`N%CB~EDWelu9oeT_23~UV`nw>!bNb*nK#1zUc1`>b(0KG~RRR910

delta 63
zcmdnS*2Bho>ff$?3=9mW3>xeVViS3_ImCq-B!n3xMJC#6Zp;a0oSe)gHu)RlNydW7
T2be?|`6gdu3S|XqU|;|M9EA_z


From d9cf03c6d5fef1153ae1f40ee45d50b08f145b6e Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 6 Sep 2021 11:02:27 +0200
Subject: [PATCH 3/3] Add Multi-Release to bnd properties

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 403c0930a0..520d08ace2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,7 +96,8 @@ jar {
             "Eclipse-ExtensibleAPI": "true",
             "Automatic-Module-Name": "io.reactivex.rxjava3",
             "Export-Package": "!io.reactivex.rxjava3.internal.*, io.reactivex.rxjava3.*",
-            "Bundle-SymbolicName": "io.reactivex.rxjava3.rxjava"
+            "Bundle-SymbolicName": "io.reactivex.rxjava3.rxjava",
+            "Multi-Release": "true"
     )
 }