Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SupportConsts.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
static class __SupportConsts {
public const string Url = "https://dl-ssl.google.com/android/repository/android_m2repository_r29.zip";
public const string Version = "23.3.0.0";
public const string AarVersion = "23.3.0";
public const string Url = "https://dl-ssl.google.com/android/repository/android_m2repository_r32.zip";
public const string Version = "23.4.0.0";
public const string AarVersion = "23.4.0";
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib/MonoAndroid403" />
</files>
</package>
22 changes: 11 additions & 11 deletions build.cake
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#tool nuget:?package=ILRepack&version=2.0.10
#tool nuget:?package=XamarinComponent&version=1.1.0.29
#tool nuget:?package=XamarinComponent

#addin nuget:?package=Cake.XCode&version=1.0.4.0
#addin nuget:?package=Cake.Xamarin&version=1.3.0.1
#addin nuget:?package=Cake.Xamarin.Build&version=1.0.11.0
#addin nuget:?package=Cake.FileHelpers&version=1.0.3.2
#addin nuget:?package=Cake.XCode
#addin nuget:?package=Cake.Xamarin
#addin nuget:?package=Cake.Xamarin.Build
#addin nuget:?package=Cake.FileHelpers

var TARGET = Argument ("t", Argument ("target", "Default"));

var NUGET_VERSION = "23.3.0-beta1";
var COMPONENT_VERSION = "23.3.0";
var AAR_VERSION = "23.3.0";
var NUGET_VERSION = "23.4.0";
var COMPONENT_VERSION = "23.4.0";
var AAR_VERSION = "23.4.0";

// FROM: https://dl.google.com/android/repository/addon.xml
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r29.zip";
var M2_REPOSITORY_URL = "https://dl-ssl.google.com/android/repository/android_m2repository_r32.zip";
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r23-macosx.zip";
var DOCS_URL = "https://dl-ssl.google.com/android/repository/docs-23_r01.zip";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the build bot need any updates for this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this pulls everything down independently of the build environment.


Expand Down Expand Up @@ -268,7 +268,7 @@ Task ("component-docs").Does (() =>
foreach (var compDir in componentDirs) {

var f = compDir.CombineWithFilePath ("./component/GettingStarted.template.md");

if (!FileExists (f))
continue;

Expand Down Expand Up @@ -300,7 +300,7 @@ Task ("component-docs").Does (() =>
foreach (var compDir in componentDirs) {

var f = compDir.CombineWithFilePath ("./component/Details.template.md");

if (!FileExists (f))
continue;

Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
# Make sure that packages.config exist.
if (!(Test-Path $PACKAGES_CONFIG)) {
Write-Verbose -Message "Downloading packages.config..."
try { Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
try { Invoke-WebRequest -Uri http://cakebuild.net/download/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
Throw "Could not download packages.config."
}
}
Expand Down
23 changes: 21 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ TOOLS_DIR=$SCRIPT_DIR/tools
NUGET_EXE=$TOOLS_DIR/nuget.exe
CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe

# BEGIN TEMP WORKAROUND
SYSIOCOMP=$TOOLS_DIR/System.IO.Compression.dll
# END TEMP WORKAROUND

# Define default arguments.
SCRIPT="build.cake"
TARGET="Default"
Expand Down Expand Up @@ -42,7 +46,7 @@ fi
# Make sure that packages.config exist.
if [ ! -f "$TOOLS_DIR/packages.config" ]; then
echo "Downloading packages.config..."
curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages
curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/download/bootstrapper/packages
if [ $? -ne 0 ]; then
echo "An error occured while downloading packages.config."
exit 1
Expand All @@ -52,7 +56,8 @@ fi
# Download NuGet if it does not exist.
if [ ! -f "$NUGET_EXE" ]; then
echo "Downloading NuGet..."
curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
# For now grab explicit 3.4.4 version instead of: https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/v3.4.4/NuGet.exe
if [ $? -ne 0 ]; then
echo "An error occured while downloading nuget.exe."
exit 1
Expand All @@ -68,6 +73,20 @@ if [ $? -ne 0 ]; then
fi
popd >/dev/null

# BEGIN TEMP WORKAROUND
# There is a bug in Mono's System.IO.Compression
# This binary fixes the bug for now
# Download System.IO.Compression if it does not exist.
if [ ! -f "$SYSIOCOMP" ]; then
echo "Downloading System.IO.Compression.dll ..."
curl -Lsfo "$SYSIOCOMP" http://xamarin-components-binaries.s3.amazonaws.com/System.IO.Compression.dll
if [ $? -ne 0 ]; then
echo "An error occured while downloading System.IO.Compression.dll."
exit 1
fi
fi
# END TEMP WORKAROUND

# Make sure that Cake has been installed.
if [ ! -f "$CAKE_EXE" ]; then
echo "Could not find Cake.exe at '$CAKE_EXE'."
Expand Down
2 changes: 1 addition & 1 deletion customtabs/nuget/Xamarin.Android.Support.CustomTabs.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.CustomTabs.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.CustomTabs.dll" target="lib/MonoAndroid403" />
</files>
</package>
2 changes: 1 addition & 1 deletion design/nuget/Xamarin.Android.Support.Design.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.Design.dll" target="lib\MonoAndroid43" />
<file src="output/Xamarin.Android.Support.Design.dll" target="lib/MonoAndroid43" />
</files>
</package>
2 changes: 1 addition & 1 deletion percent/nuget/Xamarin.Android.Support.Percent.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.Percent.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.Percent.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.Recommendation.dll" target="lib\MonoAndroid50" />
<file src="output/Xamarin.Android.Support.Recommendation.dll" target="lib/MonoAndroid50" />
</files>
</package>
2 changes: 1 addition & 1 deletion v13/nuget/Xamarin.Android.Support.v13.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v13.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v13.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v14.Preference.dll" target="lib\MonoAndroid41" />
<file src="output/Xamarin.Android.Support.v14.Preference.dll" target="lib/MonoAndroid41" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v17.Leanback.dll" target="lib\MonoAndroid50" />
<file src="output/Xamarin.Android.Support.v17.Leanback.dll" target="lib/MonoAndroid50" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v17.Preference.Leanback.dll" target="lib\MonoAndroid50" />
<file src="output/Xamarin.Android.Support.v17.Preference.Leanback.dll" target="lib/MonoAndroid50" />
</files>
</package>
2 changes: 1 addition & 1 deletion v4/nuget/Xamarin.Android.Support.v4.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
<iconUrl>https://xamarin-component-icons.s3.amazonaws.com/Xamarin.Android.Support.v4.png</iconUrl>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v4.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v4.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v7.AppCompat.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v7.AppCompat.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
<iconUrl>https://xamarin-component-icons.s3.amazonaws.com/Xamarin.Android.Support.v7.CardView.png</iconUrl>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v7.CardView.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v7.CardView.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v7.GridLayout.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v7.GridLayout.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v7.MediaRouter.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v7.MediaRouter.dll" target="lib/MonoAndroid403" />
</files>
</package>
2 changes: 1 addition & 1 deletion v7-palette/nuget/Xamarin.Android.Support.v7.Palette.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v7.Palette.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v7.Palette.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v7.Preference.dll" target="lib\MonoAndroid41" />
<file src="output/Xamarin.Android.Support.v7.Preference.dll" target="lib/MonoAndroid41" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v7.RecyclerView.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v7.RecyclerView.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
<iconUrl>https://xamarin-component-icons.s3.amazonaws.com/Xamarin.Android.Support.v8.RenderScript.png</iconUrl>
</metadata>
<files>
<file src="output/Xamarin.Android.Support.v8.RenderScript.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.v8.RenderScript.dll" target="lib/MonoAndroid403" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<file src="./vector-drawable/buildtask/bin/Release/Xamarin.Android.Support.Vector.Drawable.targets" target="build" />
<file src="./vector-drawable/buildtask/bin/Release/Xamarin.Android.Support.Tasks.VectorDrawable.dll" target="build" />

<file src="output/Xamarin.Android.Support.Vector.Drawable.dll" target="lib\MonoAndroid403" />
<file src="output/Xamarin.Android.Support.Vector.Drawable.dll" target="lib/MonoAndroid403" />
</files>
</package>