Skip to content
This repository has been archived by the owner on Apr 6, 2021. It is now read-only.

Commit

Permalink
Update all the packages and jetifier
Browse files Browse the repository at this point in the history
  • Loading branch information
mattleibow committed Jul 4, 2019
1 parent e342b98 commit 218b202
Show file tree
Hide file tree
Showing 6 changed files with 398 additions and 267 deletions.
14 changes: 2 additions & 12 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ var configuration = Argument("c", Argument("configuration", "Release"));
var nugetPath = Context.Tools.Resolve("nuget.exe");

var jetifierVersion = "1.0.0";
var jetifierBetaVersion = "-beta04";
var jetifierBetaVersion = "-beta05";
var jetifierDownloadUrl = $"https://dl.google.com/dl/android/studio/jetifier-zips/{jetifierVersion}{jetifierBetaVersion}/jetifier-standalone.zip";

var azureBuildNumber = "3246";
var azureBuildNumber = "3842";
var azureBuildUrl = $"https://dev.azure.com/xamarin/6fd3d886-57a5-4e31-8db7-52a1b47c07a8/_apis/build/builds/{azureBuildNumber}/artifacts?artifactName=nuget&%24format=zip&api-version=5.0";

var multidexPackageVersion = "2.0.1";
var multidexPackageUrl = $"https://maven.google.com/androidx/multidex/multidex/{multidexPackageVersion}/multidex-{multidexPackageVersion}.aar";

var PACKAGE_VERSION = EnvironmentVariable("PACKAGE_VERSION") ?? "1.0.0";
var PREVIEW_LABEL = EnvironmentVariable("PREVIEW_LABEL") ?? "preview";
var BUILD_NUMBER = EnvironmentVariable("BUILD_NUMBER") ?? "";
Expand Down Expand Up @@ -140,11 +137,6 @@ Task("DownloadAndroidXAssets")
CopyFileToDirectory($"{externalsRoot}nuget/AndroidX.Merged.dll", dllsRoot);
CopyFileToDirectory($"{externalsRoot}nuget/androidx-mapping.csv", "mappings");
}
var multidexAar = $"{externalsRoot}androidx.multidex.multidex.aar";
if (!FileExists(multidexAar)) {
DownloadFile(multidexPackageUrl, multidexAar);
}
});

Task("NativeAssets")
Expand Down Expand Up @@ -192,8 +184,6 @@ Task("Libraries")
CopyDirectory($"{root}/Tools/", $"{outRoot}/build/Tools/");
CopyFiles($"{root}/Mono.*", $"{outRoot}/build/");
CopyFiles($"{root}/Xamarin.*", $"{outRoot}/build/");
EnsureDirectoryExists($"{outRoot}/aar/");
CopyFileToDirectory($"externals/androidx.multidex.multidex.aar", $"{outRoot}/aar/");
Zip($"{outRoot}/", $"./output/Xamarin.AndroidX.Migration.BuildTasks.zip");
}
});
Expand Down
1 change: 0 additions & 1 deletion externals/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
AndroidX-NuGets.zip
androidx.multidex.multidex.aar
jetifier.zip

jetifier/
Expand Down
4 changes: 1 addition & 3 deletions nugets/Xamarin.AndroidX.Migration.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This package provides a set of tools and MSBuild tasks to aid in the migration f

<dependencies>
<group targetFramework="MonoAndroid9.0">
<dependency id="Xamarin.AndroidX.MultiDex" version="2.0.1-rc.14" include="All" />
<dependency id="Xamarin.AndroidX.MultiDex" version="2.0.1-rc.20" include="All" />
</group>
</dependencies>

Expand All @@ -34,8 +34,6 @@ This package provides a set of tools and MSBuild tasks to aid in the migration f

<file src="..\output\Xamarin.AndroidX.Migration.BuildTasks\build\**\*" target="build" />

<file src="..\output\Xamarin.AndroidX.Migration.BuildTasks\aar\*" target="aar" />

<file src="..\output\androidx-migrator\net47\**\*" target="tools\net47" />

<file src="_._" target="lib\monoandroid10\_._" />
Expand Down
14 changes: 7 additions & 7 deletions nugets/Xamarin.AndroidX.Xamarin.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ This package provides a set of tools and MSBuild tasks to aid in the migration f
<group targetFramework="MonoAndroid9.0">
<dependency id="Xamarin.AndroidX.Migration" version="$version$" include="All" />

<dependency id="Xamarin.AndroidX.MultiDex" version="2.0.1-rc.14" include="All" />
<dependency id="Xamarin.Google.Android.Material" version="1.0.0-rc.14" />
<dependency id="Xamarin.AndroidX.AppCompat" version="1.0.2-rc.14" />
<dependency id="Xamarin.AndroidX.Browser" version="1.0.0-rc.14" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0-rc.14" />
<dependency id="Xamarin.AndroidX.CardView" version="1.0.0-rc.14" />
<dependency id="Xamarin.AndroidX.MediaRouter" version="1.0.0-rc.14" />
<dependency id="Xamarin.AndroidX.AppCompat" version="1.0.2-rc.20" />
<dependency id="Xamarin.AndroidX.Browser" version="1.0.0-rc.20" />
<dependency id="Xamarin.AndroidX.CardView" version="1.0.0-rc.20" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0-rc.20" />
<dependency id="Xamarin.AndroidX.MediaRouter" version="1.0.0-rc.20" />
<dependency id="Xamarin.AndroidX.MultiDex" version="2.0.1-rc.20" include="All" />
<dependency id="Xamarin.Google.Android.Material" version="1.0.0-rc.20" />
</group>
</dependencies>

Expand Down
Loading

0 comments on commit 218b202

Please sign in to comment.