From a47ea0fcb2e487ac1a4677e9c3b281bb8df4685c Mon Sep 17 00:00:00 2001 From: Archangel Date: Fri, 2 Sep 2022 14:19:22 +0200 Subject: [PATCH 1/3] Update packages as some projects fail to build with older ones --- ExoPlayer.Common/ExoPlayer.Common.csproj | 2 +- ExoPlayer.Core/ExoPlayer.Core.csproj | 2 +- ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj | 2 +- ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj | 2 +- ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj | 2 +- ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj | 2 +- ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj | 2 +- ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ExoPlayer.Common/ExoPlayer.Common.csproj b/ExoPlayer.Common/ExoPlayer.Common.csproj index ce337310..8cbbf8b3 100644 --- a/ExoPlayer.Common/ExoPlayer.Common.csproj +++ b/ExoPlayer.Common/ExoPlayer.Common.csproj @@ -8,7 +8,7 @@ - + diff --git a/ExoPlayer.Core/ExoPlayer.Core.csproj b/ExoPlayer.Core/ExoPlayer.Core.csproj index dff44988..5e90c2d5 100644 --- a/ExoPlayer.Core/ExoPlayer.Core.csproj +++ b/ExoPlayer.Core/ExoPlayer.Core.csproj @@ -8,7 +8,7 @@ - + diff --git a/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj b/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj index 84da3074..1b1987a4 100644 --- a/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj +++ b/ExoPlayer.Ext.Cast/ExoPlayer.Ext.Cast.csproj @@ -8,7 +8,7 @@ - + diff --git a/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj b/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj index c9be5fe2..f76fcb7a 100644 --- a/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj +++ b/ExoPlayer.Ext.Cronet/ExoPlayer.Ext.Cronet.csproj @@ -8,7 +8,7 @@ - + diff --git a/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj b/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj index 6ae9e7e0..859ddf36 100644 --- a/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj +++ b/ExoPlayer.Ext.Media2/ExoPlayer.Ext.Media2.csproj @@ -15,7 +15,7 @@ - + diff --git a/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj b/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj index dff622ea..4f352779 100644 --- a/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj +++ b/ExoPlayer.Ext.MediaSession/ExoPlayer.Ext.MediaSession.csproj @@ -8,7 +8,7 @@ - + diff --git a/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj b/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj index d47a4211..4a8770de 100644 --- a/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj +++ b/ExoPlayer.Ext.OkHttp/ExoPlayer.Ext.OkHttp.csproj @@ -8,7 +8,7 @@ - + diff --git a/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj b/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj index 1e8e6570..b5ea6bb7 100644 --- a/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj +++ b/ExoPlayer.Ext.Workmanager/ExoPlayer.Ext.Workmanager.csproj @@ -12,6 +12,6 @@ - + \ No newline at end of file From 800ce8433dedf974e2e43fb08afdc58ee1094d37 Mon Sep 17 00:00:00 2001 From: Jesse Date: Fri, 2 Sep 2022 14:24:44 +0200 Subject: [PATCH 2/3] Update ExoPlayer.UI.csproj --- ExoPlayer.UI/ExoPlayer.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExoPlayer.UI/ExoPlayer.UI.csproj b/ExoPlayer.UI/ExoPlayer.UI.csproj index a3b62a14..ea4360c1 100644 --- a/ExoPlayer.UI/ExoPlayer.UI.csproj +++ b/ExoPlayer.UI/ExoPlayer.UI.csproj @@ -8,7 +8,7 @@ - + From 1d56a64186c1f112efbe226c7ca2fe5212adb6e8 Mon Sep 17 00:00:00 2001 From: Jesse Date: Fri, 2 Sep 2022 14:45:17 +0200 Subject: [PATCH 3/3] Fix up bindings --- ExoPlayer.Dash/Transforms/Metadata.xml | 4 ++-- ExoPlayer.Ext.Ima/Transforms/Metadata.xml | 4 +++- ExoPlayer.Hls/Transforms/Metadata.xml | 5 +++-- ExoPlayer.Rtsp/Transforms/Metadata.xml | 4 ++-- ExoPlayer.SmoothStreaming/Transforms/Metadata.xml | 6 +++--- ExoPlayer.Testutils/Transforms/Metadata.xml | 8 ++++++-- ExoPlayer.Transformer/Transforms/Metadata.xml | 3 ++- ExoPlayer.UI/Transforms/Metadata.xml | 7 ++++--- 8 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ExoPlayer.Dash/Transforms/Metadata.xml b/ExoPlayer.Dash/Transforms/Metadata.xml index bb0c1920..a8ef9dd7 100644 --- a/ExoPlayer.Dash/Transforms/Metadata.xml +++ b/ExoPlayer.Dash/Transforms/Metadata.xml @@ -51,10 +51,10 @@ Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory diff --git a/ExoPlayer.Ext.Ima/Transforms/Metadata.xml b/ExoPlayer.Ext.Ima/Transforms/Metadata.xml index c6881134..ce10e65a 100644 --- a/ExoPlayer.Ext.Ima/Transforms/Metadata.xml +++ b/ExoPlayer.Ext.Ima/Transforms/Metadata.xml @@ -72,6 +72,8 @@ - path="/api/package[@name='com.google.android.exoplayer2.ext.ima']/class[@name='ImaAdsLoader']/method[@name='OnRepeatModeChanged' and count(parameter)=1 and parameter[1][@type='int']]" + protected + + Java.Lang.Object \ No newline at end of file diff --git a/ExoPlayer.Hls/Transforms/Metadata.xml b/ExoPlayer.Hls/Transforms/Metadata.xml index bb42fe13..871285d7 100644 --- a/ExoPlayer.Hls/Transforms/Metadata.xml +++ b/ExoPlayer.Hls/Transforms/Metadata.xml @@ -17,9 +17,9 @@ Com.Google.Android.Exoplayer2.Source.IMediaSource Com.Google.Android.Exoplayer2.Source.IMediaSource - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory protected @@ -74,4 +74,5 @@ Com.Google.Android.Exoplayer2.Source.Hls.IHlsMediaChunkExtractor Com.Google.Android.Exoplayer2.Source.Hls.IHlsMediaChunkExtractor + Com.Google.Android.Exoplayer2.Source.Hls.IHlsMediaChunkExtractor diff --git a/ExoPlayer.Rtsp/Transforms/Metadata.xml b/ExoPlayer.Rtsp/Transforms/Metadata.xml index 23262fae..9e15877a 100644 --- a/ExoPlayer.Rtsp/Transforms/Metadata.xml +++ b/ExoPlayer.Rtsp/Transforms/Metadata.xml @@ -5,8 +5,8 @@ Com.Google.Android.Exoplayer2.Source.IMediaSource Com.Google.Android.Exoplayer2.Source.IMediaSource - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory diff --git a/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml b/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml index 667afcc9..40cdb76b 100644 --- a/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml +++ b/ExoPlayer.SmoothStreaming/Transforms/Metadata.xml @@ -69,9 +69,9 @@ - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory - Com.Google.Android.Exoplayer2.Source.IMediaSourceFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory diff --git a/ExoPlayer.Testutils/Transforms/Metadata.xml b/ExoPlayer.Testutils/Transforms/Metadata.xml index 728c748f..2f7ae739 100644 --- a/ExoPlayer.Testutils/Transforms/Metadata.xml +++ b/ExoPlayer.Testutils/Transforms/Metadata.xml @@ -21,7 +21,11 @@ - + - + + + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory + Com.Google.Android.Exoplayer2.Source.IMediaSource.IFactory + diff --git a/ExoPlayer.Transformer/Transforms/Metadata.xml b/ExoPlayer.Transformer/Transforms/Metadata.xml index ea1d76b0..7c1cbfd0 100644 --- a/ExoPlayer.Transformer/Transforms/Metadata.xml +++ b/ExoPlayer.Transformer/Transforms/Metadata.xml @@ -1,4 +1,5 @@ - + + diff --git a/ExoPlayer.UI/Transforms/Metadata.xml b/ExoPlayer.UI/Transforms/Metadata.xml index 093cb7e3..bffcc2b0 100644 --- a/ExoPlayer.UI/Transforms/Metadata.xml +++ b/ExoPlayer.UI/Transforms/Metadata.xml @@ -1,6 +1,6 @@  - - + + -