Update to 2.5.2

Baseflow · Sep 13, 2017 · 3d70633 · 3d70633
1 parent 658ca78
commit 3d70633
Show file tree

Hide file tree

Showing 46 changed files with 84 additions and 73 deletions.
diff --git a/ExoPlayer.Core/ExoPlayer.Core.csproj b/ExoPlayer.Core/ExoPlayer.Core.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -58,7 +58,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\exoplayer-core-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\exoplayer-core-r2.5.2.aar" />
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
diff --git a/ExoPlayer.Core/Jars/exoplayer-core-r2.5.1.aar b/ExoPlayer.Core/Jars/exoplayer-core-r2.5.1.aar
diff --git a/ExoPlayer.Core/Jars/exoplayer-core-r2.5.2.aar b/ExoPlayer.Core/Jars/exoplayer-core-r2.5.2.aar
diff --git a/ExoPlayer.Core/Transforms/Metadata.xml b/ExoPlayer.Core/Transforms/Metadata.xml
@@ -36,6 +36,8 @@
  <attr path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='SimpleExoPlayer.VideoListener']/method[@name='onRenderedFirstFrame']" name="managedName">InvokeOnRenderedFirstFrame</attr>
  <attr path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='SimpleExoPlayer.VideoListener']/method[@name='onVideoSizeChanged']" name="managedName">InvokeOnVideoSizeChanged</attr>
 
+ <remove-node path="/api/package[@name='com.google.android.exoplayer2']/class[@name='SimpleExoPlayer']/method[@name='setVideoListener' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.SimpleExoPlayer.VideoListener']]" />
+
  <!-- Remove method (abstract or interface) already implemented because it uses derived parameters -->
  <remove-node path="/api/package[@name='com.google.android.exoplayer2.text']/class[@name='SubtitleOutputBuffer']/method[@name='release' and count(parameter)=0]" />
  <remove-node path="/api/package[@name='com.google.android.exoplayer2.decoder']/class[@name='SimpleDecoder']/method[@name='createOutputBuffer' and count(parameter)=0]" />

diff --git a/ExoPlayer.Dash/ExoPlayer.Dash.csproj b/ExoPlayer.Dash/ExoPlayer.Dash.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -57,7 +58,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\exoplayer-dash-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\exoplayer-dash-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/ExoPlayer.Dash/Jars/exoplayer-dash-r2.5.1.aar b/ExoPlayer.Dash/Jars/exoplayer-dash-r2.5.1.aar
diff --git a/ExoPlayer.Dash/Jars/exoplayer-dash-r2.5.2.aar b/ExoPlayer.Dash/Jars/exoplayer-dash-r2.5.2.aar
diff --git a/ExoPlayer.Ext.Gvr/ExoPlayer.Ext.Gvr.csproj b/ExoPlayer.Ext.Gvr/ExoPlayer.Ext.Gvr.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -57,7 +58,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\extension-gvr-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\extension-gvr-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/...yer.Ext.Gvr/Jars/extension-gvr-r2.5.1.aar → ...yer.Ext.Gvr/Jars/extension-gvr-r2.5.2.aar b/...yer.Ext.Gvr/Jars/extension-gvr-r2.5.1.aar → ...yer.Ext.Gvr/Jars/extension-gvr-r2.5.2.aar
diff --git a/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj b/ExoPlayer.Ext.Ima/ExoPlayer.Ext.Ima.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -61,7 +62,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\extension-ima-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\extension-ima-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/ExoPlayer.Ext.Ima/Jars/extension-ima-r2.5.1.aar b/ExoPlayer.Ext.Ima/Jars/extension-ima-r2.5.1.aar
diff --git a/ExoPlayer.Ext.Ima/Jars/extension-ima-r2.5.2.aar b/ExoPlayer.Ext.Ima/Jars/extension-ima-r2.5.2.aar
diff --git a/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj b/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -44,13 +45,13 @@
  <Reference Include="System.Core" />
  <Reference Include="Mono.Android" />
  <Reference Include="Xamarin.Android.Support.Annotations">
- <HintPath>..\packages\Xamarin.Android.Support.Annotations.25.4.0.1\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath>
+ <HintPath>..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll</HintPath>
  </Reference>
  <Reference Include="Xamarin.Android.Support.Compat">
- <HintPath>..\packages\Xamarin.Android.Support.Compat.25.4.0.1\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath>
+ <HintPath>..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath>
  </Reference>
  <Reference Include="Xamarin.Android.Support.Media.Compat">
- <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath>
+ <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath>
  </Reference>
  </ItemGroup>
  <ItemGroup>
@@ -67,7 +68,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\extension-mediasession-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\extension-mediasession-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">
@@ -76,6 +77,6 @@
  </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
- <Import Project="..\packages\Xamarin.Android.Support.Compat.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" />
- <Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" />
+ <Import Project="..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" />
 </Project>
diff --git a/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-r2.5.1.aar b/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-r2.5.1.aar
diff --git a/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-r2.5.2.aar b/ExoPlayer.Ext.MediaSession/Jars/extension-mediasession-r2.5.2.aar
diff --git a/ExoPlayer.Ext.MediaSession/packages.config b/ExoPlayer.Ext.MediaSession/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
- <package id="Xamarin.Android.Support.Annotations" version="25.4.0.1" targetFramework="monoandroid71" />
- <package id="Xamarin.Android.Support.Compat" version="25.4.0.1" targetFramework="monoandroid71" />
- <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.1" targetFramework="monoandroid71" />
+ <package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" />
+ <package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid71" />
+ <package id="Xamarin.Android.Support.Media.Compat" version="25.4.0.2" targetFramework="monoandroid71" />
 </packages>
diff --git a/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj b/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -64,7 +65,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\extension-okhttp-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\extension-okhttp-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-r2.5.1.aar b/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-r2.5.1.aar
diff --git a/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-r2.5.2.aar b/ExoPlayer.Ext.OkHttp/Jars/extension-okhttp-r2.5.2.aar
diff --git a/ExoPlayer.Ext.Rtmp/ExoPlayer.Ext.Rtmp.csproj b/ExoPlayer.Ext.Rtmp/ExoPlayer.Ext.Rtmp.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -57,7 +58,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\extension-rtmp-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\extension-rtmp-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/...r.Ext.Rtmp/Jars/extension-rtmp-r2.5.1.aar → ...r.Ext.Rtmp/Jars/extension-rtmp-r2.5.2.aar b/...r.Ext.Rtmp/Jars/extension-rtmp-r2.5.1.aar → ...r.Ext.Rtmp/Jars/extension-rtmp-r2.5.2.aar
diff --git a/ExoPlayer.Hls/ExoPlayer.Hls.csproj b/ExoPlayer.Hls/ExoPlayer.Hls.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -57,7 +58,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\exoplayer-hls-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\exoplayer-hls-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/ExoPlayer.Hls/Jars/exoplayer-hls-r2.5.1.aar b/ExoPlayer.Hls/Jars/exoplayer-hls-r2.5.1.aar
diff --git a/ExoPlayer.Hls/Jars/exoplayer-hls-r2.5.2.aar b/ExoPlayer.Hls/Jars/exoplayer-hls-r2.5.2.aar
diff --git a/ExoPlayer.SmoothStreaming/ExoPlayer.SmoothStreaming.csproj b/ExoPlayer.SmoothStreaming/ExoPlayer.SmoothStreaming.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -57,7 +58,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\exoplayer-smoothstreaming-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\exoplayer-smoothstreaming-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-r2.5.1.aar b/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-r2.5.1.aar
diff --git a/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-r2.5.2.aar b/ExoPlayer.SmoothStreaming/Jars/exoplayer-smoothstreaming-r2.5.2.aar
diff --git a/ExoPlayer.UI/ExoPlayer.UI.csproj b/ExoPlayer.UI/ExoPlayer.UI.csproj
@@ -11,9 +11,9 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <AndroidClassParser>class-parse</AndroidClassParser>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -25,6 +25,7 @@
  <WarningLevel>4</WarningLevel>
  <AndroidLinkMode>None</AndroidLinkMode>
  <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <DebugSymbols>true</DebugSymbols>
@@ -58,7 +59,7 @@
  <TransformFile Include="Transforms\Metadata.xml" />
  </ItemGroup>
  <ItemGroup>
- <LibraryProjectZip Include="Jars\exoplayer-ui-r2.5.1.aar" />
+ <LibraryProjectZip Include="Jars\exoplayer-ui-r2.5.2.aar" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">

diff --git a/ExoPlayer.UI/Jars/exoplayer-ui-r2.5.1.aar b/ExoPlayer.UI/Jars/exoplayer-ui-r2.5.1.aar
diff --git a/ExoPlayer.UI/Jars/exoplayer-ui-r2.5.2.aar b/ExoPlayer.UI/Jars/exoplayer-ui-r2.5.2.aar
diff --git a/ExoPlayer.sln b/ExoPlayer.sln
@@ -84,7 +84,7 @@ Global
  {67FF9C9C-CE2E-42F4-8508-7FA297C69B0F}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(MonoDevelopProperties) = preSolution
- version = 2.5.1
+ version = 2.5.2
  EndGlobalSection
  GlobalSection(NestedProjects) = preSolution
  {05CAE29B-694A-4AA9-AC07-F6F2F6B1C857} = {4EF4950F-D0EE-4F8A-90E6-5F7F0B51EC78}

diff --git a/ExoPlayer/ExoPlayer.csproj b/ExoPlayer/ExoPlayer.csproj
@@ -7,12 +7,12 @@
  <ProjectGuid>{0B871C50-6D5D-45D0-B32D-84E25ADB869A}</ProjectGuid>
  <OutputType>Library</OutputType>
  <RootNamespace>ExoPlayer</RootNamespace>
- <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+ <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
  <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
  <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
  <AssemblyName>ExoPlayer</AssemblyName>
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  <AndroidTlsProvider>
  </AndroidTlsProvider>
  <AndroidClassParser>class-parse</AndroidClassParser>
@@ -62,9 +62,6 @@
  <ItemGroup>
  <Folder Include="Jars\" />
  </ItemGroup>
- <ItemGroup>
- <LibraryProjectZip Include="Jars\exoplayer-r2.5.1.aar" />
- </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\ExoPlayer.Core\ExoPlayer.Core.csproj">
  <Project>{3CFF9208-5DAB-4377-B7E5-F4407FF5BD46}</Project>
@@ -87,5 +84,8 @@
  <Name>ExoPlayer.UI</Name>
  </ProjectReference>
  </ItemGroup>
+ <ItemGroup>
+ <LibraryProjectZip Include="Jars\exoplayer-r2.5.2.aar" />
+ </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
 </Project>
diff --git a/ExoPlayer/Jars/exoplayer-r2.5.1.aar b/ExoPlayer/Jars/exoplayer-r2.5.1.aar
diff --git a/ExoPlayer/Jars/exoplayer-r2.5.2.aar b/ExoPlayer/Jars/exoplayer-r2.5.2.aar
diff --git a/Samples/Official Demo/ExoPlayer.Demo.csproj b/Samples/Official Demo/ExoPlayer.Demo.csproj
@@ -18,7 +18,7 @@
  <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
  <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
  <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
- <ReleaseVersion>2.5.1</ReleaseVersion>
+ <ReleaseVersion>2.5.2</ReleaseVersion>
  <AndroidTlsProvider></AndroidTlsProvider>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/nuspec/Xam.Plugins.Android.ExoPlayer.Core.nuspec b/nuspec/Xam.Plugins.Android.ExoPlayer.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
  <metadata>
  <id>Xam.Plugins.Android.ExoPlayer.Core</id>
- <version>2.5.1.4</version>
+ <version>2.5.2</version>
  <title>ExoPlayer Core Extension for Xamarin.Android</title>
  <authors>Martijn van Dijk</authors>
  <owners>Martijn van Dijk</owners>