diff --git a/Android/ReactiveX/License.md b/Android/ReactiveX/License.md index 99fa5fcd5d..ba6b1ba72c 100644 --- 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 \ No newline at end of file diff --git a/Android/ReactiveX/build.cake b/Android/ReactiveX/build.cake index 8ded8de917..a50d0870cf 100644 --- 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/source/rxjava2/RxAndroid/RxAndroid.csproj b/Android/ReactiveX/source/rxjava2/RxAndroid/RxAndroid.csproj index b4246f22bc..1ab026831b 100644 --- a/Android/ReactiveX/source/rxjava2/RxAndroid/RxAndroid.csproj +++ b/Android/ReactiveX/source/rxjava2/RxAndroid/RxAndroid.csproj @@ -20,9 +20,9 @@ Microsoft © Microsoft Corporation. All rights reserved. https://go.microsoft.com/fwlink/?linkid=2083771 - LICENSE.md + https://go.microsoft.com/fwlink/?linkid=2083684 true - 2.1.1.1 + 2.1.1.2 @@ -32,34 +32,16 @@ latest -<<<<<<< HEAD - - -======= ->>>>>>> main - - rxandroid-2.1.1.aar - - - - -<<<<<<< HEAD -======= - - - - ->>>>>>> main @@ -67,11 +49,8 @@ ..\..\..\externals\rxjava2\rxandroid-javadocs\ - + - diff --git a/Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj b/Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj index 60c460ba64..570596a28e 100644 --- a/Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj +++ b/Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj @@ -1,4 +1,4 @@ - + MonoAndroid90 @@ -20,9 +20,9 @@ Microsoft © Microsoft Corporation. All rights reserved. https://go.microsoft.com/fwlink/?linkid=2083771 - LICENSE.md + https://go.microsoft.com/fwlink/?linkid=2083684 true - 2.2.12 + 2.2.21 @@ -41,9 +41,6 @@ - - rxjava-2.2.10.jar - @@ -52,11 +49,8 @@ ..\..\..\externals\rxjava2\rxjava-javadocs\ - + - diff --git a/Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj b/Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj index e3204ee077..70547f80e9 100644 --- a/Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj +++ b/Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj @@ -20,17 +20,9 @@ Microsoft © Microsoft Corporation. All rights reserved. https://go.microsoft.com/fwlink/?linkid=2083771 - LICENSE.md + https://go.microsoft.com/fwlink/?linkid=2083684 true -<<<<<<< HEAD - 2.4.0 - - - - - rxkotlin.jar -======= - 2.4.0.1 + 2.4.0.2 @@ -45,10 +37,6 @@ - - rxkotlin-2.4.0.jar ->>>>>>> main - @@ -56,11 +44,8 @@ ..\..\..\externals\rxjava2\rxkotlin-javadocs\ - + - diff --git a/Android/ReactiveX/source/rxjava3/RxAndroid/RxAndroid.csproj b/Android/ReactiveX/source/rxjava3/RxAndroid/RxAndroid.csproj index 7d5cb86af6..237239b052 100644 --- a/Android/ReactiveX/source/rxjava3/RxAndroid/RxAndroid.csproj +++ b/Android/ReactiveX/source/rxjava3/RxAndroid/RxAndroid.csproj @@ -2,7 +2,6 @@ MonoAndroid90 - MonoAndroid90 true Xamarin.Android.ReactiveX.RxJava3.RxAndroid Resources @@ -26,7 +25,7 @@ https://go.microsoft.com/fwlink/?linkid=2083771 https://go.microsoft.com/fwlink/?linkid=2083684 true - 3.0.0.1 + 3.0.0.2 @@ -35,9 +34,6 @@ - - rxandroid-3.0.0.jar - @@ -46,7 +42,7 @@ ..\..\..\externals\rxjava3\rxandroid-javadocs\ - + diff --git a/Android/ReactiveX/source/rxjava3/RxKotlin/RxKotlin.csproj b/Android/ReactiveX/source/rxjava3/RxKotlin/RxKotlin.csproj index b885d05095..97a247d9b0 100644 --- a/Android/ReactiveX/source/rxjava3/RxKotlin/RxKotlin.csproj +++ b/Android/ReactiveX/source/rxjava3/RxKotlin/RxKotlin.csproj @@ -2,7 +2,6 @@ MonoAndroid90 - MonoAndroid90 true Xamarin.Android.ReactiveX.RxJava3.RxKotlin Resources @@ -26,7 +25,7 @@ https://go.microsoft.com/fwlink/?linkid=2083771 https://go.microsoft.com/fwlink/?linkid=2083684 true - 3.0.1.1 + 3.0.1.2 @@ -45,7 +44,7 @@ ..\..\..\externals\rxjava3\rxkotlin-javadocs\ - +