Merge pull request #107 from xamarin/27.0.2.1

Use newer java interop code gen target
xamarin · Jun 21, 2018 · 1038010 · 1038010
2 parents e15142b + 0b84d65
commit 1038010
Show file tree

Hide file tree

Showing 46 changed files with 143 additions and 87 deletions.
diff --git a/animated-vector-drawable/source/Animated-Vector-Drawable.csproj b/animated-vector-drawable/source/Animated-Vector-Drawable.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/appcompat-v7/source/V7-AppCompat.csproj b/appcompat-v7/source/V7-AppCompat.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/arch-core/common/source/Arch.Core.Common.csproj b/arch-core/common/source/Arch.Core.Common.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/arch-core/runtime/source/Arch.Core.Runtime.csproj b/arch-core/runtime/source/Arch.Core.Runtime.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj b/arch-lifecycle/common/source/Arch.Lifecycle.Common.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/arch-lifecycle/extensions/source/Arch.Lifecycle.Extensions.csproj b/arch-lifecycle/extensions/source/Arch.Lifecycle.Extensions.csproj
@@ -13,6 +13,7 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj b/arch-lifecycle/runtime/source/Arch.Lifecycle.Runtime.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/build.cake b/build.cake
@@ -16,7 +16,8 @@
 #addin nuget:?package=Cake.Xamarin&version=3.0.0
 #addin nuget:?package=Cake.XCode&version=4.0.0
 #addin nuget:?package=Cake.Xamarin.Build&version=4.0.0
-#addin nuget:?package=Cake.Compression&version=0.1.4
+#addin nuget:?package=SharpZipLib&version=0.86.0
+#addin nuget:?package=Cake.Compression&version=0.1.6
 #addin nuget:?package=Cake.Android.SdkManager&version=3.0.0
 #addin nuget:?package=Cake.Android.Adb&version=3.0.0
 #addin nuget:?package=Cake.MonoApiTools&version=2.0.0
@@ -35,7 +36,7 @@ var BUILD_CONFIG = Argument ("config", "Release");
 
 var NUGET_PRE = "";
 
-var NUGET_VERSION = "27.0.2" + NUGET_PRE;
+var NUGET_VERSION = "27.0.2.1" + NUGET_PRE;
 var COMPONENT_VERSION = "27.0.2.0";
 var AAR_VERSION = "27.0.2";
 
@@ -45,11 +46,11 @@ var ARCH_LIFECYCLE_COMMON_AAR_VERSION = "1.0.3";
 var ARCH_LIFECYCLE_RUNTIME_AAR_VERSION = "1.0.3";
 var ARCH_LIFECYCLE_EXTENSIONS_AAR_VERSION = "1.0.0";
 
-var ARCH_CORE_COMMON_NUGET_VERSION = "1.0.0" + NUGET_PRE;
-var ARCH_CORE_RUNTIME_NUGET_VERSION = "1.0.0" + NUGET_PRE;
-var ARCH_LIFECYCLE_COMMON_NUGET_VERSION = "1.0.3" + NUGET_PRE;
-var ARCH_LIFECYCLE_RUNTIME_NUGET_VERSION = "1.0.3" + NUGET_PRE;
-var ARCH_LIFECYCLE_EXTENSIONS_NUGET_VERSION = "1.0.0" + NUGET_PRE;
+var ARCH_CORE_COMMON_NUGET_VERSION = "1.0.0.1" + NUGET_PRE;
+var ARCH_CORE_RUNTIME_NUGET_VERSION = "1.0.0.1" + NUGET_PRE;
+var ARCH_LIFECYCLE_COMMON_NUGET_VERSION = "1.0.3.1" + NUGET_PRE;
+var ARCH_LIFECYCLE_RUNTIME_NUGET_VERSION = "1.0.3.1" + NUGET_PRE;
+var ARCH_LIFECYCLE_EXTENSIONS_NUGET_VERSION = "1.0.0.1" + NUGET_PRE;
 
 
 var DOC_VERSION = "2017-12-18";
@@ -67,7 +68,7 @@ var REFERENCE_DOCS_URL = "https://developer.android.com/reference/";
 var REFERENCE_DOCS_PACKAGELIST_URL = REFERENCE_DOCS_URL + "android/support/package-list";
 
 // We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff
-var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/26.1.0/api-info.xml";
+var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/27.0.2/api-info.xml";
 
 var CPU_COUNT = 1;
 var USE_MSBUILD_ON_MAC = true;

diff --git a/build.sh b/build.sh
@@ -47,11 +47,16 @@ fi
 
 # Make sure that packages.config exist.
 if [ ! -f "$TOOLS_DIR/packages.config" ]; then
-    echo "Downloading packages.config..."
-    curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages
-    if [ $? -ne 0 ]; then
-        echo "An error occurred while downloading packages.config."
-        exit 1
+    if [ ! -f "$SCRIPT_DIR/cake.packages.config" ]; then
+        echo "Downloading packages.config..."
+        curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages
+        if [ $? -ne 0 ]; then
+            echo "An error occurred while downloading packages.config."
+            exit 1
+        fi
+    else
+        echo "using local cake.packages.config..."
+        cp "$SCRIPT_DIR/cake.packages.config" "$TOOLS_DIR/packages.config"
     fi
 fi
 

diff --git a/cake.packages.config b/cake.packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+	<package id="Cake" version="0.27.0" />
+</packages>
diff --git a/cardview-v7/source/V7-CardView.csproj b/cardview-v7/source/V7-CardView.csproj
@@ -18,6 +18,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/constraint-layout/source/ConstraintLayout.csproj b/constraint-layout/source/ConstraintLayout.csproj
@@ -13,6 +13,7 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/customtabs/source/CustomTabs.csproj b/customtabs/source/CustomTabs.csproj
@@ -17,6 +17,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/design/source/Design.csproj b/design/source/Design.csproj
@@ -17,6 +17,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/exifinterface/source/Exif.csproj b/exifinterface/source/Exif.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/gridlayout-v7/source/V7-GridLayout.csproj b/gridlayout-v7/source/V7-GridLayout.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/leanback-v17/source/V17-Leanback.csproj b/leanback-v17/source/V17-Leanback.csproj
@@ -18,6 +18,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/mediarouter-v7/source/V7-MediaRouter.csproj b/mediarouter-v7/source/V7-MediaRouter.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/palette-v7/source/V7-Palette.csproj b/palette-v7/source/V7-Palette.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/percent/source/Percent.csproj b/percent/source/Percent.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/preference-leanback-v17/source/V17-Preference-Leanback.csproj b/preference-leanback-v17/source/V17-Preference-Leanback.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/preference-v14/source/V14-Preference.csproj b/preference-v14/source/V14-Preference.csproj
@@ -20,6 +20,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/preference-v7/source/V7-Preference.csproj b/preference-v7/source/V7-Preference.csproj
@@ -20,6 +20,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/recommendation/source/Recommendation.csproj b/recommendation/source/Recommendation.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/recyclerview-v7/source/V7-RecyclerView.csproj b/recyclerview-v7/source/V7-RecyclerView.csproj
@@ -19,6 +19,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/renderscript-v8/source/V8-RenderScript.csproj b/renderscript-v8/source/V8-RenderScript.csproj
@@ -18,6 +18,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/support-annotations/source/Annotations.csproj b/support-annotations/source/Annotations.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/support-compat/nuget/template.nuspec b/support-compat/nuget/template.nuspec
@@ -15,7 +15,7 @@
     <dependencies>
       <group targetFramework="MonoAndroid81">
         <dependency id="Xamarin.Android.Support.Annotations" version="[$version$]" />
-        <dependency id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.3" />
+        <dependency id="Xamarin.Android.Arch.Lifecycle.Runtime" version="$android.arch.lifecycle.runtime$" />
       </group>
     </dependencies>
   </metadata>

diff --git a/support-compat/source/Compat.csproj b/support-compat/source/Compat.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/support-content/source/Content.csproj b/support-content/source/Content.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/support-core-ui/source/Core-UI.csproj b/support-core-ui/source/Core-UI.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/support-core-utils/source/Core-Utils.csproj b/support-core-utils/source/Core-Utils.csproj
@@ -16,6 +16,7 @@
     <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
     <AndroidClassParser>class-parse</AndroidClassParser>
+    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>