Update rxjava versions, fix reference external libs with cake

xamarin · Jul 17, 2021 · e8ff09b · e8ff09b
1 parent e8f59b4
commit e8ff09b
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 88 deletions.
diff --git a/Android/ReactiveX/License.md b/Android/ReactiveX/License.md
@@ -14,9 +14,4 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-<<<<<<< HEAD
-20160601
-=======
-20210329
-
->>>>>>> main
+20210329
diff --git a/Android/ReactiveX/build.cake b/Android/ReactiveX/build.cake
@@ -2,21 +2,21 @@
 
 var TARGET = Argument ("t", Argument ("target", "ci"));
 
-var RXJAVA2_RXJAVA_VERSION = "2.2.12";
+var RXJAVA2_RXJAVA_VERSION = "2.2.21";
 var RXJAVA2_RXANDROID_VERSION = "2.1.1";
 var RXJAVA2_RXKOTLIN_VERSION = "2.4.0";
 
-var RXJAVA3_RXJAVA_VERSION = "3.0.1";
+var RXJAVA3_RXJAVA_VERSION = "3.0.13";
 var RXJAVA3_RXANDROID_VERSION = "3.0.0";
 var RXJAVA3_RXKOTLIN_VERSION = "3.0.1";
 
-var RXJAVA2_RXJAVA_NUGET_VERSION = $"{RXJAVA2_RXJAVA_VERSION}.1";
-var RXJAVA2_RXANDROID_NUGET_VERSION = $"{RXJAVA2_RXANDROID_VERSION}.1";
-var RXJAVA2_RXKOTLIN_NUGET_VERSION = $"{RXJAVA2_RXKOTLIN_VERSION}.1";
+var RXJAVA2_RXJAVA_NUGET_VERSION = $"{RXJAVA2_RXJAVA_VERSION}";
+var RXJAVA2_RXANDROID_NUGET_VERSION = $"{RXJAVA2_RXANDROID_VERSION}.2";
+var RXJAVA2_RXKOTLIN_NUGET_VERSION = $"{RXJAVA2_RXKOTLIN_VERSION}.2";
 
-var RXJAVA3_RXJAVA_NUGET_VERSION = $"{RXJAVA3_RXJAVA_VERSION}.1";
-var RXJAVA3_RXANDROID_NUGET_VERSION = $"{RXJAVA3_RXANDROID_VERSION}.1";
-var RXJAVA3_RXKOTLIN_NUGET_VERSION = $"{RXJAVA3_RXKOTLIN_VERSION}.1";
+var RXJAVA3_RXJAVA_NUGET_VERSION = $"{RXJAVA3_RXJAVA_VERSION}";
+var RXJAVA3_RXANDROID_NUGET_VERSION = $"{RXJAVA3_RXANDROID_VERSION}.2";
+var RXJAVA3_RXKOTLIN_NUGET_VERSION = $"{RXJAVA3_RXKOTLIN_VERSION}.2";
 
 
 var RXJAVA2_RXJAVA_JAR_URL = $"https://search.maven.org/remotecontent?filepath=io/reactivex/rxjava2/rxjava/{RXJAVA2_RXJAVA_VERSION}/rxjava-{RXJAVA2_RXJAVA_VERSION}.jar";
@@ -79,12 +79,18 @@ Task ("externals")
 
 	// Update .csproj nuget versions
 	XmlPoke("./source/rxjava2/RxJava/RxJava.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA2_RXJAVA_NUGET_VERSION);
+	XmlPoke("./source/rxjava2/RxJava/RxJava.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava2/rxjava-{RXJAVA2_RXJAVA_VERSION}.jar");
 	XmlPoke("./source/rxjava2/RxAndroid/RxAndroid.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA2_RXANDROID_NUGET_VERSION);
+	XmlPoke("./source/rxjava2/RxAndroid/RxAndroid.csproj", "/Project/ItemGroup/LibraryProjectZip/@Include", $"../../../externals/rxjava2/rxandroid-{RXJAVA2_RXANDROID_VERSION}.aar");
 	XmlPoke("./source/rxjava2/RxKotlin/RxKotlin.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA2_RXKOTLIN_NUGET_VERSION);
+	XmlPoke("./source/rxjava2/RxKotlin/RxKotlin.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava2/rxkotlin-{RXJAVA2_RXKOTLIN_VERSION}.jar");
 
 	XmlPoke("./source/rxjava3/RxJava/RxJava.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA3_RXJAVA_NUGET_VERSION);
+	XmlPoke("./source/rxjava3/RxJava/RxJava.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava3/rxjava-{RXJAVA3_RXJAVA_VERSION}.jar");
 	XmlPoke("./source/rxjava3/RxAndroid/RxAndroid.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA3_RXANDROID_NUGET_VERSION);
+	XmlPoke("./source/rxjava3/RxAndroid/RxAndroid.csproj", "/Project/ItemGroup/LibraryProjectZip/@Include", $"../../../externals/rxjava3/rxandroid-{RXJAVA3_RXANDROID_VERSION}.aar");
 	XmlPoke("./source/rxjava3/RxKotlin/RxKotlin.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA3_RXKOTLIN_NUGET_VERSION);
+	XmlPoke("./source/rxjava3/RxKotlin/RxKotlin.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava3/rxkotlin-{RXJAVA3_RXKOTLIN_VERSION}.jar");
 });
 
 Task("native")
@@ -148,10 +154,9 @@ Task ("clean")
 											Force = true
 											}
 						);
+
 	CleanDirectories("./generated/*/bin");
 	CleanDirectories("./generated/*/obj");
-
-	CleanDirectories("./externals/");
 	CleanDirectories("./generated/");
 	CleanDirectories("./native/.gradle");
 	CleanDirectories("./native/**/build");

diff --git a/Android/ReactiveX/cgmanifest.json b/Android/ReactiveX/cgmanifest.json
@@ -6,7 +6,7 @@
         "Maven": {
           "ArtifactId": "rxjava",
           "GroupId": "io.reactivex.rxjava2",
-          "Version": "2.2.12"
+          "Version": "2.2.21"
         }
       }
     },
@@ -36,7 +36,7 @@
         "Maven": {
           "ArtifactId": "rxjava",
           "GroupId": "io.reactivex.rxjava3",
-          "Version": "3.0.1"
+          "Version": "3.0.13"
         }
       }
     },

diff --git a/Android/ReactiveX/source/rxjava2/RxAndroid/RxAndroid.csproj b/Android/ReactiveX/source/rxjava2/RxAndroid/RxAndroid.csproj
@@ -20,9 +20,9 @@
     <Owners>Microsoft</Owners>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>2.1.1.1</PackageVersion>
+    <PackageVersion>2.1.1.2</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,46 +32,25 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-<<<<<<< HEAD
-    <None Remove="Transforms\*.xml" />
-    <TransformFile Include="Transforms\*.xml" />
-=======
     <TransformFile Include="Transforms\Metadata.xml" />
     <TransformFile Include="Transforms\Metadata.Namespaces.xml" />
->>>>>>> main
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\externals\rxjava2\rxandroid-2.1.1.aar">
-      <Link>rxandroid-2.1.1.aar</Link>
-    </None>
     <None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
     <None Include="..\..\..\License.md" Pack="true" PackagePath="LICENSE.md" />
   </ItemGroup>
 
   <ItemGroup>
-  </ItemGroup>
-
-  <ItemGroup>
-<<<<<<< HEAD
-=======
-    <PackageReference Include="Xamarin.Android.ReactiveStreams" Version="1.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
->>>>>>> main
     <ProjectReference Include="..\RxJava\RxJava.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
     <JavaDocPaths>..\..\..\externals\rxjava2\rxandroid-javadocs\</JavaDocPaths>
   </PropertyGroup>
   <ItemGroup>
-    <LibraryProjectZip Include="..\..\..\externals\rxjava2\rxandroid-2.1.1.aar" />
+    <LibraryProjectZip Include="../../../externals/rxjava2/rxandroid-2.1.1.aar" />
     <JavaDocJar Include="..\..\..\externals\rxjava2\rxandroid-javadocs.jar" />
-    <!--
-    <JavaSourceJar Include="..\..\..\externals\rxjava2\" />
-    -->
   </ItemGroup>
 
 </Project>
diff --git a/Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj b/Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFrameworks>MonoAndroid90</TargetFrameworks>
@@ -20,9 +20,9 @@
     <Owners>Microsoft</Owners>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>2.2.12</PackageVersion>
+    <PackageVersion>2.2.21</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,9 +41,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\externals\rxjava2\rxjava-2.2.10.jar">
-      <Link>rxjava-2.2.10.jar</Link>
-    </None>
     <None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
     <None Include="..\..\..\License.md" Pack="true" PackagePath="LICENSE.md" />
   </ItemGroup>
@@ -52,11 +49,8 @@
     <JavaDocPaths>..\..\..\externals\rxjava2\rxjava-javadocs\</JavaDocPaths>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedJar Include="..\..\..\externals\rxjava2\rxjava-2.2.10.jar" />
+    <EmbeddedJar Include="../../../externals/rxjava2/rxjava-2.2.21.jar" />
     <JavaDocJar Include="..\..\..\externals\rxjava2\rxjava-javadocs.jar" />
-    <!--
-    <JavaSourceJar Include="..\..\..\externals\rxjava2\" />
-    -->
   </ItemGroup>
 
 </Project>
diff --git a/Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj b/Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj
@@ -20,17 +20,9 @@
     <Owners>Microsoft</Owners>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
+    <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-<<<<<<< HEAD
-    <PackageVersion>2.4.0</PackageVersion>
-  </PropertyGroup>
-
- <ItemGroup>
-    <None Include="..\..\..\externals\rxjava2\rxkotlin.jar">
-      <Link>rxkotlin.jar</Link>
-=======
-    <PackageVersion>2.4.0.1</PackageVersion>
+    <PackageVersion>2.4.0.2</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -45,22 +37,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\externals\rxjava2\rxkotlin-2.4.0.jar">
-      <Link>rxkotlin-2.4.0.jar</Link>
->>>>>>> main
-    </None>
     <None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
   </ItemGroup>
 
   <PropertyGroup>
     <JavaDocPaths>..\..\..\externals\rxjava2\rxkotlin-javadocs\</JavaDocPaths>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedJar Include="..\..\..\externals\rxjava2\rxkotlin-2.4.0.jar" />
+    <EmbeddedJar Include="../../../externals/rxjava2/rxkotlin-2.4.0.jar" />
     <JavaDocJar Include="..\..\..\externals\rxjava2\rxkotlin-javadocs.jar" />
-    <!--
-    <JavaSourceJar Include="..\..\..\externals\rxjava2\" />
-    -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Android/ReactiveX/source/rxjava3/RxAndroid/RxAndroid.csproj b/Android/ReactiveX/source/rxjava3/RxAndroid/RxAndroid.csproj
@@ -2,7 +2,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
-    <TargetFrameworks>MonoAndroid90</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.ReactiveX.RxJava3.RxAndroid</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -26,7 +25,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>3.0.0.1</PackageVersion>
+    <PackageVersion>3.0.0.2</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,9 +34,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\externals\rxjava3\rxandroid-3.0.0.aar">
-      <Link>rxandroid-3.0.0.jar</Link>
-    </None>
     <None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
   </ItemGroup>
 
@@ -46,7 +42,7 @@
     <JavaDocPaths>..\..\..\externals\rxjava3\rxandroid-javadocs\</JavaDocPaths>
   </PropertyGroup>
   <ItemGroup>
-    <LibraryProjectZip Include="..\..\..\externals\rxjava3\rxandroid-3.0.0.aar" />
+    <LibraryProjectZip Include="../../../externals/rxjava3/rxandroid-3.0.0.aar" />
     <JavaDocJar Include="..\..\..\externals\rxjava3\rxandroid-javadocs.jar" />
     <!--
     <JavaSourceJar Include="..\..\..\externals\rxjava3\" />

diff --git a/Android/ReactiveX/source/rxjava3/RxJava/RxJava.csproj b/Android/ReactiveX/source/rxjava3/RxJava/RxJava.csproj
@@ -2,7 +2,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
-    <TargetFrameworks>MonoAndroid90</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.ReactiveX.RxJava3.RxJava</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -26,7 +25,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>3.0.1.1</PackageVersion>
+    <PackageVersion>3.0.13</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,21 +34,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\..\externals\rxjava3\rxjava-3.0.1.jar">
-      <Link>rxjava-3.0.1.jar</Link>
-    </None>
     <None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
   </ItemGroup>
 
   <PropertyGroup>
     <JavaDocPaths>..\..\..\externals\rxjava3\rxjava-javadocs\</JavaDocPaths>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedJar Include="..\..\..\externals\rxjava3\rxjava-3.0.1.jar" />
+    <EmbeddedJar Include="../../../externals/rxjava3/rxjava-3.0.13.jar" />
     <JavaDocJar Include="..\..\..\externals\rxjava3\rxjava-javadocs.jar" />
-    <!--
-    <JavaSourceJar Include="..\..\..\externals\rxjava3\" />
-    -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Android/ReactiveX/source/rxjava3/RxKotlin/RxKotlin.csproj b/Android/ReactiveX/source/rxjava3/RxKotlin/RxKotlin.csproj
@@ -2,7 +2,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
   <PropertyGroup>
     <TargetFramework>MonoAndroid90</TargetFramework>
-    <TargetFrameworks>MonoAndroid90</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <AssemblyName>Xamarin.Android.ReactiveX.RxJava3.RxKotlin</AssemblyName>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -26,7 +25,7 @@
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
     <PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageVersion>3.0.1.1</PackageVersion>
+    <PackageVersion>3.0.1.2</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -45,7 +44,7 @@
     <JavaDocPaths>..\..\..\externals\rxjava3\rxkotlin-javadocs\</JavaDocPaths>
   </PropertyGroup>
   <ItemGroup>
-    <EmbeddedJar Include="..\..\..\externals\rxjava3\rxkotlin-3.0.1.jar" />
+    <EmbeddedJar Include="../../../externals/rxjava3/rxkotlin-3.0.1.jar" />
     <JavaDocJar Include="..\..\..\externals\rxjava3\rxkotlin-javadocs.jar" />
     <!--
     <JavaSourceJar Include="..\..\..\externals\rxjava3\" />