Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 883addd

Browse files
author
Antonio Seric
committed
Update rxjava versions, fix reference external libs with cake
1 parent e8f59b4 commit 883addd

File tree

7 files changed

+31
-80
lines changed

7 files changed

+31
-80
lines changed

‎Android/ReactiveX/build.cake‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
var TARGET = Argument ("t", Argument ("target", "ci"));
44

5-
var RXJAVA2_RXJAVA_VERSION = "2.2.12";
5+
var RXJAVA2_RXJAVA_VERSION = "2.2.21";
66
var RXJAVA2_RXANDROID_VERSION = "2.1.1";
77
var RXJAVA2_RXKOTLIN_VERSION = "2.4.0";
88

9-
var RXJAVA3_RXJAVA_VERSION = "3.0.1";
9+
var RXJAVA3_RXJAVA_VERSION = "3.0.13";
1010
var RXJAVA3_RXANDROID_VERSION = "3.0.0";
1111
var RXJAVA3_RXKOTLIN_VERSION = "3.0.1";
1212

13-
var RXJAVA2_RXJAVA_NUGET_VERSION = $"{RXJAVA2_RXJAVA_VERSION}.1";
14-
var RXJAVA2_RXANDROID_NUGET_VERSION = $"{RXJAVA2_RXANDROID_VERSION}.1";
15-
var RXJAVA2_RXKOTLIN_NUGET_VERSION = $"{RXJAVA2_RXKOTLIN_VERSION}.1";
13+
var RXJAVA2_RXJAVA_NUGET_VERSION = $"{RXJAVA2_RXJAVA_VERSION}";
14+
var RXJAVA2_RXANDROID_NUGET_VERSION = $"{RXJAVA2_RXANDROID_VERSION}.2";
15+
var RXJAVA2_RXKOTLIN_NUGET_VERSION = $"{RXJAVA2_RXKOTLIN_VERSION}.2";
1616

17-
var RXJAVA3_RXJAVA_NUGET_VERSION = $"{RXJAVA3_RXJAVA_VERSION}.1";
18-
var RXJAVA3_RXANDROID_NUGET_VERSION = $"{RXJAVA3_RXANDROID_VERSION}.1";
19-
var RXJAVA3_RXKOTLIN_NUGET_VERSION = $"{RXJAVA3_RXKOTLIN_VERSION}.1";
17+
var RXJAVA3_RXJAVA_NUGET_VERSION = $"{RXJAVA3_RXJAVA_VERSION}";
18+
var RXJAVA3_RXANDROID_NUGET_VERSION = $"{RXJAVA3_RXANDROID_VERSION}.2";
19+
var RXJAVA3_RXKOTLIN_NUGET_VERSION = $"{RXJAVA3_RXKOTLIN_VERSION}.2";
2020

2121

2222
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")
7979

8080
// Update .csproj nuget versions
8181
XmlPoke("./source/rxjava2/RxJava/RxJava.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA2_RXJAVA_NUGET_VERSION);
82+
XmlPoke("./source/rxjava2/RxJava/RxJava.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava2/rxjava-{RXJAVA2_RXJAVA_VERSION}.jar");
8283
XmlPoke("./source/rxjava2/RxAndroid/RxAndroid.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA2_RXANDROID_NUGET_VERSION);
84+
XmlPoke("./source/rxjava2/RxAndroid/RxAndroid.csproj", "/Project/ItemGroup/LibraryProjectZip/@Include", $"../../../externals/rxjava2/rxandroid-{RXJAVA2_RXANDROID_VERSION}.aar");
8385
XmlPoke("./source/rxjava2/RxKotlin/RxKotlin.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA2_RXKOTLIN_NUGET_VERSION);
86+
XmlPoke("./source/rxjava2/RxKotlin/RxKotlin.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava2/rxkotlin-{RXJAVA2_RXKOTLIN_VERSION}.jar");
8487

8588
XmlPoke("./source/rxjava3/RxJava/RxJava.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA3_RXJAVA_NUGET_VERSION);
89+
XmlPoke("./source/rxjava3/RxJava/RxJava.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava3/rxjava-{RXJAVA3_RXJAVA_VERSION}.jar");
8690
XmlPoke("./source/rxjava3/RxAndroid/RxAndroid.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA3_RXANDROID_NUGET_VERSION);
91+
XmlPoke("./source/rxjava3/RxAndroid/RxAndroid.csproj", "/Project/ItemGroup/LibraryProjectZip/@Include", $"../../../externals/rxjava3/rxandroid-{RXJAVA3_RXANDROID_VERSION}.aar");
8792
XmlPoke("./source/rxjava3/RxKotlin/RxKotlin.csproj", "/Project/PropertyGroup/PackageVersion", RXJAVA3_RXKOTLIN_NUGET_VERSION);
93+
XmlPoke("./source/rxjava3/RxKotlin/RxKotlin.csproj", "/Project/ItemGroup/EmbeddedJar/@Include", $"../../../externals/rxjava3/rxkotlin-{RXJAVA3_RXKOTLIN_VERSION}.jar");
8894
});
8995

9096
Task("native")
@@ -148,10 +154,9 @@ Task ("clean")
148154
Force = true
149155
}
150156
);
157+
151158
CleanDirectories("./generated/*/bin");
152159
CleanDirectories("./generated/*/obj");
153-
154-
CleanDirectories("./externals/");
155160
CleanDirectories("./generated/");
156161
CleanDirectories("./native/.gradle");
157162
CleanDirectories("./native/**/build");

‎Android/ReactiveX/source/rxjava2/RxAndroid/RxAndroid.csproj‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<Owners>Microsoft</Owners>
2121
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
2222
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
23-
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
23+
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
2424
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
25-
<PackageVersion>2.1.1.1</PackageVersion>
25+
<PackageVersion>2.1.1.2</PackageVersion>
2626
</PropertyGroup>
2727

2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,46 +32,25 @@
3232
<LangVersion>latest</LangVersion>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<<<<<<< HEAD
36-
<None Remove="Transforms\*.xml" />
37-
<TransformFile Include="Transforms\*.xml" />
38-
=======
3935
<TransformFile Include="Transforms\Metadata.xml" />
4036
<TransformFile Include="Transforms\Metadata.Namespaces.xml" />
41-
>>>>>>> main
4237
</ItemGroup>
4338

4439
<ItemGroup>
45-
<None Include="..\..\..\externals\rxjava2\rxandroid-2.1.1.aar">
46-
<Link>rxandroid-2.1.1.aar</Link>
47-
</None>
4840
<None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
4941
<None Include="..\..\..\License.md" Pack="true" PackagePath="LICENSE.md" />
5042
</ItemGroup>
5143

5244
<ItemGroup>
53-
</ItemGroup>
54-
55-
<ItemGroup>
56-
<<<<<<< HEAD
57-
=======
58-
<PackageReference Include="Xamarin.Android.ReactiveStreams" Version="1.0.3" />
59-
</ItemGroup>
60-
61-
<ItemGroup>
62-
>>>>>>> main
6345
<ProjectReference Include="..\RxJava\RxJava.csproj" />
6446
</ItemGroup>
6547

6648
<PropertyGroup>
6749
<JavaDocPaths>..\..\..\externals\rxjava2\rxandroid-javadocs\</JavaDocPaths>
6850
</PropertyGroup>
6951
<ItemGroup>
70-
<LibraryProjectZip Include="..\..\..\externals\rxjava2\rxandroid-2.1.1.aar" />
52+
<LibraryProjectZip Include="../../../externals/rxjava2/rxandroid-2.1.1.aar" />
7153
<JavaDocJar Include="..\..\..\externals\rxjava2\rxandroid-javadocs.jar" />
72-
<!--
73-
<JavaSourceJar Include="..\..\..\externals\rxjava2\" />
74-
-->
7554
</ItemGroup>
7655

7756
</Project>

‎Android/ReactiveX/source/rxjava2/RxJava/RxJava.csproj‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
33
<PropertyGroup>
44
<TargetFrameworks>MonoAndroid90</TargetFrameworks>
@@ -20,9 +20,9 @@
2020
<Owners>Microsoft</Owners>
2121
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
2222
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
23-
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
23+
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
2424
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
25-
<PackageVersion>2.2.12</PackageVersion>
25+
<PackageVersion>2.2.21</PackageVersion>
2626
</PropertyGroup>
2727

2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,9 +41,6 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<None Include="..\..\..\externals\rxjava2\rxjava-2.2.10.jar">
45-
<Link>rxjava-2.2.10.jar</Link>
46-
</None>
4744
<None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
4845
<None Include="..\..\..\License.md" Pack="true" PackagePath="LICENSE.md" />
4946
</ItemGroup>
@@ -52,11 +49,8 @@
5249
<JavaDocPaths>..\..\..\externals\rxjava2\rxjava-javadocs\</JavaDocPaths>
5350
</PropertyGroup>
5451
<ItemGroup>
55-
<EmbeddedJar Include="..\..\..\externals\rxjava2\rxjava-2.2.10.jar" />
52+
<EmbeddedJar Include="../../../externals/rxjava2/rxjava-2.2.21.jar" />
5653
<JavaDocJar Include="..\..\..\externals\rxjava2\rxjava-javadocs.jar" />
57-
<!--
58-
<JavaSourceJar Include="..\..\..\externals\rxjava2\" />
59-
-->
6054
</ItemGroup>
6155

6256
</Project>

‎Android/ReactiveX/source/rxjava2/RxKotlin/RxKotlin.csproj‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,9 @@
2020
<Owners>Microsoft</Owners>
2121
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
2222
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
23-
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
23+
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
2424
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
25-
<<<<<<< HEAD
26-
<PackageVersion>2.4.0</PackageVersion>
27-
</PropertyGroup>
28-
29-
<ItemGroup>
30-
<None Include="..\..\..\externals\rxjava2\rxkotlin.jar">
31-
<Link>rxkotlin.jar</Link>
32-
=======
33-
<PackageVersion>2.4.0.1</PackageVersion>
25+
<PackageVersion>2.4.0.2</PackageVersion>
3426
</PropertyGroup>
3527

3628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -45,22 +37,15 @@
4537
</ItemGroup>
4638

4739
<ItemGroup>
48-
<None Include="..\..\..\externals\rxjava2\rxkotlin-2.4.0.jar">
49-
<Link>rxkotlin-2.4.0.jar</Link>
50-
>>>>>>> main
51-
</None>
5240
<None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
5341
</ItemGroup>
5442

5543
<PropertyGroup>
5644
<JavaDocPaths>..\..\..\externals\rxjava2\rxkotlin-javadocs\</JavaDocPaths>
5745
</PropertyGroup>
5846
<ItemGroup>
59-
<EmbeddedJar Include="..\..\..\externals\rxjava2\rxkotlin-2.4.0.jar" />
47+
<EmbeddedJar Include="../../../externals/rxjava2/rxkotlin-2.4.0.jar" />
6048
<JavaDocJar Include="..\..\..\externals\rxjava2\rxkotlin-javadocs.jar" />
61-
<!--
62-
<JavaSourceJar Include="..\..\..\externals\rxjava2\" />
63-
-->
6449
</ItemGroup>
6550

6651
<ItemGroup>

‎Android/ReactiveX/source/rxjava3/RxAndroid/RxAndroid.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
33
<PropertyGroup>
44
<TargetFramework>MonoAndroid90</TargetFramework>
5-
<TargetFrameworks>MonoAndroid90</TargetFrameworks>
65
<IsBindingProject>true</IsBindingProject>
76
<AssemblyName>Xamarin.Android.ReactiveX.RxJava3.RxAndroid</AssemblyName>
87
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -26,7 +25,7 @@
2625
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
2726
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
2827
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
29-
<PackageVersion>3.0.0.1</PackageVersion>
28+
<PackageVersion>3.0.0.2</PackageVersion>
3029
</PropertyGroup>
3130

3231
<ItemGroup>
@@ -35,9 +34,6 @@
3534
</ItemGroup>
3635

3736
<ItemGroup>
38-
<None Include="..\..\..\externals\rxjava3\rxandroid-3.0.0.aar">
39-
<Link>rxandroid-3.0.0.jar</Link>
40-
</None>
4137
<None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
4238
</ItemGroup>
4339

@@ -46,7 +42,7 @@
4642
<JavaDocPaths>..\..\..\externals\rxjava3\rxandroid-javadocs\</JavaDocPaths>
4743
</PropertyGroup>
4844
<ItemGroup>
49-
<LibraryProjectZip Include="..\..\..\externals\rxjava3\rxandroid-3.0.0.aar" />
45+
<LibraryProjectZip Include="../../../externals/rxjava3/rxandroid-3.0.0.aar" />
5046
<JavaDocJar Include="..\..\..\externals\rxjava3\rxandroid-javadocs.jar" />
5147
<!--
5248
<JavaSourceJar Include="..\..\..\externals\rxjava3\" />

‎Android/ReactiveX/source/rxjava3/RxJava/RxJava.csproj‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
33
<PropertyGroup>
44
<TargetFramework>MonoAndroid90</TargetFramework>
5-
<TargetFrameworks>MonoAndroid90</TargetFrameworks>
65
<IsBindingProject>true</IsBindingProject>
76
<AssemblyName>Xamarin.Android.ReactiveX.RxJava3.RxJava</AssemblyName>
87
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -26,7 +25,7 @@
2625
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
2726
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
2827
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
29-
<PackageVersion>3.0.1.1</PackageVersion>
28+
<PackageVersion>3.0.13</PackageVersion>
3029
</PropertyGroup>
3130

3231
<ItemGroup>
@@ -35,21 +34,15 @@
3534
</ItemGroup>
3635

3736
<ItemGroup>
38-
<None Include="..\..\..\externals\rxjava3\rxjava-3.0.1.jar">
39-
<Link>rxjava-3.0.1.jar</Link>
40-
</None>
4137
<None Include="..\..\..\External-Dependency-Info.txt" Pack="True" PackagePath="THIRD-PARTY-NOTICES.txt" />
4238
</ItemGroup>
4339

4440
<PropertyGroup>
4541
<JavaDocPaths>..\..\..\externals\rxjava3\rxjava-javadocs\</JavaDocPaths>
4642
</PropertyGroup>
4743
<ItemGroup>
48-
<EmbeddedJar Include="..\..\..\externals\rxjava3\rxjava-3.0.1.jar" />
44+
<EmbeddedJar Include="../../../externals/rxjava3/rxjava-3.0.13.jar" />
4945
<JavaDocJar Include="..\..\..\externals\rxjava3\rxjava-javadocs.jar" />
50-
<!--
51-
<JavaSourceJar Include="..\..\..\externals\rxjava3\" />
52-
-->
5346
</ItemGroup>
5447

5548
<ItemGroup>

‎Android/ReactiveX/source/rxjava3/RxKotlin/RxKotlin.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
33
<PropertyGroup>
44
<TargetFramework>MonoAndroid90</TargetFramework>
5-
<TargetFrameworks>MonoAndroid90</TargetFrameworks>
65
<IsBindingProject>true</IsBindingProject>
76
<AssemblyName>Xamarin.Android.ReactiveX.RxJava3.RxKotlin</AssemblyName>
87
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -26,7 +25,7 @@
2625
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2083771</PackageProjectUrl>
2726
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2083684</PackageLicenseUrl>
2827
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
29-
<PackageVersion>3.0.1.1</PackageVersion>
28+
<PackageVersion>3.0.1.2</PackageVersion>
3029
</PropertyGroup>
3130

3231
<ItemGroup>
@@ -45,7 +44,7 @@
4544
<JavaDocPaths>..\..\..\externals\rxjava3\rxkotlin-javadocs\</JavaDocPaths>
4645
</PropertyGroup>
4746
<ItemGroup>
48-
<EmbeddedJar Include="..\..\..\externals\rxjava3\rxkotlin-3.0.1.jar" />
47+
<EmbeddedJar Include="../../../externals/rxjava3/rxkotlin-3.0.1.jar" />
4948
<JavaDocJar Include="..\..\..\externals\rxjava3\rxkotlin-javadocs.jar" />
5049
<!--
5150
<JavaSourceJar Include="..\..\..\externals\rxjava3\" />

0 commit comments

Comments
 (0)