Import remaining ReactiveX packages from XamarinComponents. (#641)

config.json

@@ -1731,6 +1731,15 @@
         "dependencyOnly": false,
         "templateSet": "napier"
       },
+      {
+        "groupId": "io.reactivex.rxjava2",
+        "artifactId": "rxandroid",
+        "version": "2.1.1",
+        "nugetVersion": "2.1.1.1",
+        "nugetId": "Xamarin.Android.ReactiveX.RxAndroid",
+        "dependencyOnly": false,
+        "templateSet": "rxjava"
+      },
       {
         "groupId": "io.reactivex.rxjava2",
         "artifactId": "rxjava",
@@ -1740,6 +1749,24 @@
         "dependencyOnly": false,
         "templateSet": "rxjava"
       },
+      {
+        "groupId": "io.reactivex.rxjava2",
+        "artifactId": "rxkotlin",
+        "version": "2.4.0",
+        "nugetVersion": "2.4.0.1",
+        "nugetId": "Xamarin.Android.ReactiveX.RxKotlin",
+        "dependencyOnly": false,
+        "templateSet": "rxjava"
+      },
+      {
+        "groupId": "io.reactivex.rxjava3",
+        "artifactId": "rxandroid",
+        "version": "3.0.0",
+        "nugetVersion": "3.0.0.1",
+        "nugetId": "Xamarin.Android.ReactiveX.RxJava3.RxAndroid",
+        "dependencyOnly": false,
+        "templateSet": "rxjava"
+      },
       {
         "groupId": "io.reactivex.rxjava3",
         "artifactId": "rxjava",
@@ -1749,6 +1776,15 @@
         "dependencyOnly": false,
         "templateSet": "rxjava"
       },
+      {
+        "groupId": "io.reactivex.rxjava3",
+        "artifactId": "rxkotlin",
+        "version": "3.0.1",
+        "nugetVersion": "3.0.1.1",
+        "nugetId": "Xamarin.Android.ReactiveX.RxJava3.RxKotlin",
+        "dependencyOnly": false,
+        "templateSet": "rxjava"
+      },
       {
         "groupId": "org.checkerframework",
         "artifactId": "checker-compat-qual",

published-namespaces.txt

@@ -411,6 +411,9 @@ Kotlin.Time.Jdk8
 Microsoft.CodeAnalysis
 ReactiveStreams
 ReactiveX
+ReactiveX.Android
+ReactiveX.Android.Plugins
+ReactiveX.Android.Schedulers
 ReactiveX.Annotations
 ReactiveX.Disposables
 ReactiveX.Exceptions
@@ -437,6 +440,9 @@ ReactiveX.Observers
 ReactiveX.Parallel
 ReactiveX.Plugins
 ReactiveX.Processors
+ReactiveX.RxJava3.Android
+ReactiveX.RxJava3.Android.Plugins
+ReactiveX.RxJava3.Android.Schedulers
 ReactiveX.RxJava3.Annotations
 ReactiveX.RxJava3.Core
 ReactiveX.RxJava3.Disposables
@@ -460,6 +466,7 @@ ReactiveX.RxJava3.Internal.Schedulers
 ReactiveX.RxJava3.Internal.Subscribers
 ReactiveX.RxJava3.Internal.Subscriptions
 ReactiveX.RxJava3.Internal.Util
+ReactiveX.RxJava3.Kotlin
 ReactiveX.RxJava3.Observables
 ReactiveX.RxJava3.Observers
 ReactiveX.RxJava3.Operators
@@ -469,6 +476,7 @@ ReactiveX.RxJava3.Processors
 ReactiveX.RxJava3.Schedulers
 ReactiveX.RxJava3.Subjects
 ReactiveX.RxJava3.Subscribers
+ReactiveX.RxKotlin
 ReactiveX.Schedulers
 ReactiveX.Subjects
 ReactiveX.Subscribers

source/io.reactivex.rxjava2/RxAndroid/Transforms/Metadata.Namespaces.xml

@@ -0,0 +1,22 @@
+<metadata>
+
+    <attr
+        path="/api/package[@name='io.reactivex.android']"
+        name="managedName"
+        >
+        ReactiveX.Android
+    </attr>
+    <attr
+        path="/api/package[@name='io.reactivex.android.plugins']"
+        name="managedName"
+        >
+        ReactiveX.Android.Plugins
+    </attr>
+    <attr
+        path="/api/package[@name='io.reactivex.android.schedulers']"
+        name="managedName"
+        >
+        ReactiveX.Android.Schedulers
+    </attr>
+  
+</metadata>

source/io.reactivex.rxjava2/RxKotlin/Transforms/Metadata.Namespaces.xml

@@ -0,0 +1,9 @@
+<metadata>  
+    <attr
+        path="/api/package[@name='io.reactivex.rxkotlin']"
+        name="managedName"
+        >
+        ReactiveX.RxKotlin
+    </attr>
+
+</metadata>

source/io.reactivex.rxjava3/RxAndroid/Transforms/Metadata.Namespaces.xml

@@ -0,0 +1,22 @@
+<metadata>
+
+    <attr
+        path="/api/package[@name='io.reactivex.rxjava3.android']"
+        name="managedName"
+        >
+        ReactiveX.RxJava3.Android
+    </attr>
+    <attr
+        path="/api/package[@name='io.reactivex.rxjava3.android.plugins']"
+        name="managedName"
+        >
+        ReactiveX.RxJava3.Android.Plugins
+    </attr>
+    <attr
+        path="/api/package[@name='io.reactivex.rxjava3.android.schedulers']"
+        name="managedName"
+        >
+        ReactiveX.RxJava3.Android.Schedulers
+    </attr>
+  
+</metadata>

source/io.reactivex.rxjava3/RxKotlin/Transforms/Metadata.Namespaces.xml

@@ -0,0 +1,9 @@
+<metadata>
+    <attr
+        path="/api/package[@name='io.reactivex.rxjava3.kotlin']"
+        name="managedName"
+        >
+        ReactiveX.RxJava3.Kotlin
+    </attr>
+
+</metadata>

templates/rxjava/Project.cshtml

@@ -52,17 +52,22 @@
 
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
-    <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)@(rx_version)-@(art.MavenArtifactVersion).jar" Link="Jars\%(Filename)%(Extension)" />
+      if (art.MavenArtifactPackaging == "aar") {
-    <JavaSourceJar Include="..\..\externals\@(art.MavenGroupId)\*-sources.jar" Link="Jars\%(Filename)%(Extension)" />
+        <AndroidLibrary Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" />
+        <JavaDocJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar" />
+      } else {
+        <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)@(rx_version)-@(art.MavenArtifactVersion).jar" Link="Jars\%(Filename)%(Extension)" />
+        <JavaSourceJar Include="..\..\externals\@(art.MavenGroupId)\*-sources.jar" Link="Jars\%(Filename)%(Extension)" />
+      }
     }
   </ItemGroup>
 
   <ItemGroup>
-    <TransformFile Include="..\..\source\@(Model.MavenGroupId)\RxJava\Transforms\*.xml" Link="Transforms\%(Filename)%(Extension)" />
+    <TransformFile Include="..\..\source\@(Model.MavenGroupId)\@(Model.Name)\Transforms\*.xml" Link="Transforms\%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\source\@(Model.MavenGroupId)\RxJava\Additions\*.cs" Link="Additions\%(Filename)%(Extension)" />
+    <Compile Include="..\..\source\@(Model.MavenGroupId)\@(Model.Name)\Additions\*.cs" Link="Additions\%(Filename)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>