[build] remove usage of ant

Configuration.props

@@ -74,8 +74,6 @@
     <GradleHome Condition=" '$(GradleHome)' == '' ">$(MSBuildThisFileDirectory)build-tools\gradle</GradleHome>
     <GradleWPath Condition=" '$(GradleWPath)' == '' ">$(GradleHome)\gradlew</GradleWPath>
     <GradleArgs Condition=" '$(GradleArgs)' == '' ">--stacktrace --no-daemon</GradleArgs>
-    <AntDirectory Condition=" '$(AntDirectory)' == '' ">$(AndroidToolchainDirectory)\ant</AntDirectory>
-    <AntToolPath Condition=" '$(AntToolPath)' == '' ">$(AntDirectory)\bin</AntToolPath>
     <AndroidSupportedHostJitAbis Condition=" '$(AndroidSupportedHostJitAbis)' == '' ">$(HostOS)</AndroidSupportedHostJitAbis>
     <AndroidSupportedTargetJitAbis Condition=" '$(AndroidSupportedTargetJitAbis)' == '' ">armeabi-v7a:arm64-v8a:x86</AndroidSupportedTargetJitAbis>
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj

@@ -46,7 +46,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Xamarin.Android.Tools.BootstrapTasks\Adb.cs" />
     <Compile Include="Xamarin.Android.Tools.BootstrapTasks\Android.cs" />
-    <Compile Include="Xamarin.Android.Tools.BootstrapTasks\Ant.cs" />
     <Compile Include="Xamarin.Android.Tools.BootstrapTasks\BundleTool.cs" />
     <Compile Include="Xamarin.Android.Tools.BootstrapTasks\CheckAdbTarget.cs" />
     <Compile Include="Xamarin.Android.Tools.BootstrapTasks\CreateAndroidEmulator.cs" />

build-tools/automation/build.linux.groovy

@@ -4,7 +4,6 @@
 def XADir = "xamarin-android"
 def buildTarget = 'jenkins'
 def chRootPackages = '''
-    ant
     autoconf
     automake
     build-essential

build-tools/scripts/PrepareImageDependencies.targets

@@ -10,7 +10,6 @@
     <ItemGroup>
       <_Dir Include="sdk" />
       <_Dir Include="ndk" />
-      <_Dir Include="ant" />
     </ItemGroup>
     <ItemGroup>
       <_Package
@@ -21,10 +20,6 @@
           Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' "
           Include="@(AndroidNdkItem->'$(AndroidUri)/%(RelUrl)%(Identity).zip ndk/%(DestDir)')"
       />
-      <_Package
-          Condition=" '%(HostOS)' == '$(HostOS)' Or '%(HostOS)' == '' "
-          Include="@(AntItem->'$(AntUri)/%(RelUrl)%(Identity).zip ant/%(DestDir)')"
-      />
     </ItemGroup>
     <ItemGroup>
       <_Brew

build-tools/xaprepare/xaprepare/Application/VersionFetchers.cs

@@ -15,7 +15,6 @@ class VersionFetchers
 
 		public readonly Dictionary<string, ProgramVersionParser> Fetchers = new Dictionary <string, ProgramVersionParser> (Context.Instance.OS.DefaultStringComparer) {
 			{"7z",       "--help",    MakeRegex ($"Version {StandardVersionRegex}"),   3},
-			{"ant",      "-version",  MakeRegex ($"version {StandardVersionRegex}"),   1},
 			{"autoconf", "--version", StandardVersionAtEOL,                            1},
 			{"automake", "--version", StandardVersionAtEOL,                            1},
 			{"brew",     "--version", MakeRegex ($"^Homebrew {StandardVersionRegex}"), 1},

build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.Windows.cs

@@ -15,11 +15,6 @@ partial class Urls
 			public static readonly Uri Corretto64 = new Uri ($"{Corretto_BaseUri}{CorrettoUrlPathVersion}/amazon-corretto-{CorrettoDistVersion}-windows-x64-jdk.zip");
 			public static readonly Uri Corretto32 = new Uri ($"{Corretto_BaseUri}{CorrettoUrlPathVersion}/amazon-corretto-{CorrettoDistVersion}-windows-x86-jdk.zip");
 
-			/// <summary>
-			///   Base URL for the Ant tool download. Used in <see cref ="AndroidToolchain"/>
-			/// </summary>
-			public static readonly Uri AntBaseUri = new Uri ("https://archive.apache.org/dist/ant/binaries/");
-
 			static Uri GetWindowsCorrettoUrl ()
 			{
 				if (Context.Instance.OS == null)
@@ -49,12 +44,6 @@ partial class Paths
 			public const string MonoCrossRuntimeInstallPath                       = "Windows";
 			public static readonly string MonoRuntimeHostMingwNativeLibraryPrefix = Path.Combine ("..", "bin");
 			public const string NdkToolchainOSTag                                 = "windows";
-			public const string AntArchiveName                                    = "apache-ant-1.10.6-bin.zip";
-			public static string AntArchivePath                                   => GetCachedPath (ref antArchivePath, () => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainCacheDirectory), AntArchiveName));
-			public static string AntInstallDir                                    => GetCachedPath (ref antInstallDir, ()  => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainDirectory), "ant"));
 		}
-
-		static string antArchivePath;
-		static string antInstallDir;
 	}
 }

build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs

@@ -5,7 +5,6 @@ namespace Xamarin.Android.Prepare
 	abstract class LinuxDebianCommon : Linux
 	{
 		static readonly List<DebianLinuxProgram> commonPackages = new List<DebianLinuxProgram> {
-			new DebianLinuxProgram ("ant"),
 			new DebianLinuxProgram ("autoconf"),
 			new DebianLinuxProgram ("autotools-dev"),
 			new DebianLinuxProgram ("automake"),

build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/MacOS.cs

@@ -6,7 +6,6 @@ namespace Xamarin.Android.Prepare
 	partial class MacOS
 	{
 		static readonly List<Program> programs = new List<Program> {
-			new HomebrewProgram ("ant"),
 			new HomebrewProgram ("autoconf"),
 			new HomebrewProgram ("automake"),
 			new HomebrewProgram ("cmake"),

build-tools/xaprepare/xaprepare/OperatingSystems/Linux.cs

@@ -68,8 +68,6 @@ protected override bool InitOS ()
 		{
 			if (!base.InitOS ())
 				return false;
-
-			AntDirectory = "/usr";
 			return true;
 		}
 

build-tools/xaprepare/xaprepare/OperatingSystems/MacOS.cs

@@ -92,7 +92,6 @@ protected override bool InitOS ()
 			if (String.IsNullOrEmpty (mxePath))
 				Context.Instance.Properties.Set (KnownProperties.AndroidMxeFullPath, HomebrewPrefix);
 
-			AntDirectory = HomebrewPrefix;
 			return true;
 		}
 

build-tools/xaprepare/xaprepare/OperatingSystems/OS.cs

@@ -41,11 +41,6 @@ abstract class OS : AppObject
 		/// </summary>
 		public Dictionary<string, string> EnvironmentVariables { get; }
 
-		/// <summary>
-		///   Path to the directory under which <c>bin/ant</c> is installed.
-		/// </summary>
-		public string AntDirectory   { get; set; }
-
 		/// <summary>
 		///   Path to <c>javac</c> (full or relative)
 		/// </summary>

build-tools/xaprepare/xaprepare/OperatingSystems/Windows.cs

@@ -93,7 +93,6 @@ protected override bool InitOS ()
 			// This is required by Android SDK which uses a utility to locate Java on Windows
 			// ($SDK_ROOT/tools/lib/find_java.bat) and that utility, in turn, looks at JAVA_HOME
 			EnvironmentVariables ["JAVA_HOME"] = JavaHome;
-			AntDirectory = Configurables.Paths.AntInstallDir;
 
 			return true;
 		}

build-tools/xaprepare/xaprepare/Resources/Configuration.OperatingSystem.props.in

@@ -20,6 +20,5 @@
         <JarPath Condition=" '$(JarPath)' == '' ">@jar@</JarPath>
         <JavaPath Condition=" '$(JavaPath)' == '' ">@java@</JavaPath>
         <HostHomebrewPrefix Condition=" '$(HostHomebrewPrefix)' == '' ">@HOST_HOMEBREW_PREFIX@</HostHomebrewPrefix>
-        <AntDirectory Condition=" '$(AntDirectory)' == '' ">@ANT_DIRECTORY@</AntDirectory>
     </PropertyGroup>
 </Project>

build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.Windows.cs

@@ -6,9 +6,6 @@ partial class Scenario_Standard
 	{
 		partial void AddRequiredOSSpecificSteps (bool beforeBundle)
 		{
-			if (beforeBundle) {
-				Steps.Add (new Step_InstallAnt ());
-			}
 		}
 	}
 }

build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs

@@ -102,7 +102,6 @@ GeneratedFile Get_Configuration_OperatingSystem_props (Context context)
 				{ "@javac@",                context.OS.JavaCPath },
 				{ "@java@",                 context.OS.JavaPath },
 				{ "@jar@",                  context.OS.JarPath },
-				{ "@ANT_DIRECTORY@",        context.OS.AntDirectory },
 			};
 
 			return new GeneratedPlaceholdersFile (

build-tools/xaprepare/xaprepare/xaprepare.csproj

@@ -263,7 +263,6 @@
     <Compile Include="OperatingSystems\Windows.cs" />
     <Compile Include="Scenarios\Scenario_Standard.Windows.cs" />
     <Compile Include="Steps\Step_GenerateFiles.Windows.cs" />
-    <Compile Include="Steps\Step_InstallAnt.Windows.cs" />
     <Compile Include="Steps\Step_InstallCorrettoOpenJDK.Windows.cs" />
     <Compile Include="Steps\Step_PrepareBundle.Windows.cs" />
     <Compile Include="Steps\Step_PrepareExternal.Windows.cs" />

src/proguard/proguard.targets

@@ -1,5 +1,4 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll"  TaskName="Xamarin.Android.Tools.BootstrapTasks.Ant" />
   <PropertyGroup>
     <_OutputJar>$(OutputPath)lib\proguard.jar</_OutputJar>
     <_OutputBat>$(OutputPath)bin\proguard.bat</_OutputBat>
@@ -12,11 +11,10 @@
   <Target Name="_BuildProGuard"
       Inputs="$(MSBuildThisFile);$(ProGuardSourceFullPath)\buildscripts\build.xml"
       Outputs="@(_Outputs)">
-    <Ant
-        Arguments="$(AntProguardBuildAdditionalArguments) -f buildscripts\build.xml proguard"
-        ToolPath="$(AntToolPath)"
-        JavaSdkDirectory="$(JavaSdkDirectory)"
-        WorkingDirectory="$(ProGuardSourceFullPath)"
+    <Exec
+        Command="&quot;$(GradleWPath)&quot; proguardJar $(GradleArgs)"
+        EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory);APP_HOME=$(GradleHome)"
+        WorkingDirectory="$(ProGuardSourceFullPath)\buildscripts"
     />
     <MakeDir Directories="$(OutputPath)" />
     <Copy
@@ -39,11 +37,10 @@
   </Target>
   <Target Name="Clean">
     <Delete Files="@(_Outputs)" />
-    <Ant
-        Arguments="-f buildscripts\build.xml clean"
-        ToolPath="$(AntToolPath)"
-        JavaSdkDirectory="$(JavaSdkDirectory)"
-        WorkingDirectory="$(ProGuardSourceFullPath)"
+    <Exec
+        Command="&quot;$(GradleWPath)&quot; clean $(GradleArgs)"
+        EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory);APP_HOME=$(GradleHome)"
+        WorkingDirectory="$(ProGuardSourceFullPath)\buildscripts"
     />
   </Target>
   <Target Name="CoreCompile" />