Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DO NOT MERGE] demo test net6 BuildActions CI Glide #1398

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[DO NOT MERGE] demo test net6 BuildActions CI Glide #1398

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ea2872
version bumps
moljac Aug 2, 2022
3b02c0c
TFMs updates + nuget dependencies bumps
moljac Aug 2, 2022
9e116f3
ambiguity resolved (ITransformation)
moljac Aug 3, 2022
01a063b
Xamarin.Legacy.Sdk bump
moljac Aug 3, 2022
4ea496d
new CI settings
moljac Aug 3, 2022
eaec26b
comment removed
moljac Aug 3, 2022
1c7ef44
Merge branch 'main' into do-not-merge-demo-test-net6-build-actions-ci…
moljac Aug 3, 2022
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
4 changes: 2 additions & 2 deletions Android/Glide/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var TARGET = Argument ("t", Argument ("target", "ci"));

var NUGET_PATCH = ".2";
var NUGET_PATCH = ".0";

var GLIDE_VERSION = "4.12.0";
var GLIDE_VERSION = "4.13.2";
var GLIDE_NUGET_VERSION = GLIDE_VERSION + NUGET_PATCH;
var GLIDE_URL = $"https://repo1.maven.org/maven2/com/github/bumptech/glide/glide/{GLIDE_VERSION}/glide-{GLIDE_VERSION}.aar";

Expand Down
8 changes: 3 additions & 5 deletions Android/Glide/source/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>MonoAndroid9.0;MonoAndroid10.0;net6.0-android</TargetFrameworks>
<TargetFrameworks>MonoAndroid12.0;net6.0-android</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<Authors>Microsoft</Authors>
<Owners>Microsoft</Owners>
Expand All @@ -18,11 +18,9 @@
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>false</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
</PropertyGroup>
<ItemGroup>
<GlideBuildFolders Include="build\monoandroid9.0" />
<GlideBuildFolders Include="build\monoandroid10.0" />
<GlideBuildFolders Include="build\monoandroid12.0" />
<GlideBuildFolders Include="build\net6.0-android31.0" />
<GlideBuildFolders Include="buildTransitive\monoandroid9.0" />
<GlideBuildFolders Include="buildTransitive\monoandroid10.0" />
<GlideBuildFolders Include="buildTransitive\monoandroid12.0" />
<GlideBuildFolders Include="buildTransitive\net6.0-android31.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...Glide/source/Xamarin.Android.Glide.DiskLruCache/Xamarin.Android.Glide.DiskLruCache.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PropertyGroup>
<Title>Glide Disk LRU Cache for Xamarin.Android</Title>
<PackageDescription>Xamarin.Android bindings for Glide Disk LRU Cache</PackageDescription>
<PackageVersion>4.12.0.2</PackageVersion>
<PackageVersion>4.13.2.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...oid/Glide/source/Xamarin.Android.Glide.GifDecoder/Xamarin.Android.Glide.GifDecoder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<PropertyGroup>
<Title>Glide GIF Decoder for Xamarin.Android</Title>
<PackageDescription>Xamarin.Android bindings for Glide GIF Decoder</PackageDescription>
<PackageVersion>4.12.0.2</PackageVersion>
<PackageVersion>4.13.2.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.2.0.1" />
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ndroid.Glide.RecyclerViewIntegration/Xamarin.Android.Glide.RecyclerViewIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PropertyGroup>
<Title>Glide RecyclerView integration for Xamarin.Android</Title>
<PackageDescription>Xamarin.Android bindings for Glide RecyclerView integration</PackageDescription>
<PackageVersion>4.12.0.2</PackageVersion>
<PackageVersion>4.13.2.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.1" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.2.1.7" />
</ItemGroup>

<ItemGroup>
Expand Down
144 changes: 73 additions & 71 deletions Android/Glide/source/Xamarin.Android.Glide/Additions/Additions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Android.Net;
using Android.OS;
using Android.Runtime;
//using Android.Service.Autofill;
moljac marked this conversation as resolved.
Show resolved Hide resolved
using Bumptech.Glide.Load;
using Bumptech.Glide.Load.Engine;
using Bumptech.Glide.Load.Resource.Bitmap;
Expand All @@ -15,6 +16,7 @@
using Java.IO;
using Java.Lang;
using Java.Util.Concurrent;
using static Android.Graphics.BitmapFactory;

namespace Bumptech.Glide
{
Expand All @@ -35,13 +37,13 @@ public partial class RequestBuilder
public virtual RequestBuilder Decode(Class resourceClass) => (RequestBuilder)Decode_T(resourceClass);

public virtual RequestBuilder DisallowHardwareConfig() => (RequestBuilder)DisallowHardwareConfig_T();

public virtual RequestBuilder Downsample(DownsampleStrategy strategy) => (RequestBuilder)Downsample_T(strategy);

public virtual RequestBuilder EncodeFormat(Bitmap.CompressFormat format) => (RequestBuilder)EncodeFormat_T(format);

public virtual RequestBuilder EncodeQuality(int quality) => (RequestBuilder)EncodeQuality_T(quality);

public virtual RequestBuilder Error(Drawable drawable) => (RequestBuilder)Error_T(drawable);

public virtual RequestBuilder Error(int resourceId) => (RequestBuilder)Error_T(resourceId);
Expand All @@ -57,7 +59,7 @@ public partial class RequestBuilder
public virtual RequestBuilder Frame(long frameTimeMicros) => (RequestBuilder)Frame_T(frameTimeMicros);

public virtual RequestBuilder Lock() => (RequestBuilder)Lock_T();

public virtual RequestBuilder OptionalCenterCrop() => (RequestBuilder)OptionalCenterCrop_T();

public virtual RequestBuilder OptionalCenterInside() => (RequestBuilder)OptionalCenterInside_T();
Expand All @@ -77,7 +79,7 @@ public partial class RequestBuilder
public virtual RequestBuilder Placeholder(Drawable drawable) => (RequestBuilder)Placeholder_T(drawable);

public virtual RequestBuilder Placeholder(int resourceId) => (RequestBuilder)Placeholder_T(resourceId);

public virtual RequestBuilder Set(Option option, Object value) => (RequestBuilder)Set_T(option, value);

public virtual RequestBuilder SetDiskCacheStrategy(DiskCacheStrategy strategy) => (RequestBuilder)DiskCacheStrategy_T(strategy);
Expand Down Expand Up @@ -118,66 +120,66 @@ public partial class AssetFileDescriptorLocalUriFetcher
}

public partial class FileDescriptorAssetPathFetcher
{
{
protected override void Close(Object data) => Close((ParcelFileDescriptor)data);

protected override Object LoadResource(AssetManager assetManager, string path) => LoadResource_T(assetManager, path);
}

public partial class FileDescriptorLocalUriFetcher
{
protected override void Close(Object data) => Close((ParcelFileDescriptor)data);
public partial class FileDescriptorLocalUriFetcher
{
protected override void Close(Object data) => Close((ParcelFileDescriptor)data);

protected override Object LoadResource(Uri uri, ContentResolver contentResolver) => LoadResource_T(uri, contentResolver);
}

public partial class StreamAssetPathFetcher
{
protected override void Close(Object data)
{
protected override void Close(Object data)
{
var stream = InputStreamInvoker.FromJniHandle(((InputStream)data).Handle, JniHandleOwnership.DoNotTransfer);

Close(stream);
}

protected override Object LoadResource(AssetManager assetManager, string path)
{
var handle = InputStreamAdapter.ToLocalJniHandle(LoadResource_T(assetManager, path));

try
{
return new Object(handle, JniHandleOwnership.TransferLocalRef);
}
finally
{
JNIEnv.DeleteLocalRef(handle);
}
}
}
{
var handle = InputStreamAdapter.ToLocalJniHandle(LoadResource_T(assetManager, path));

try
{
return new Object(handle, JniHandleOwnership.TransferLocalRef);
}
finally
{
JNIEnv.DeleteLocalRef(handle);
}
}
}

public partial class StreamLocalUriFetcher
{
protected override void Close(Object data)
{
protected override void Close(Object data)
{
var stream = InputStreamInvoker.FromJniHandle(((InputStream)data).Handle, JniHandleOwnership.DoNotTransfer);

Close(stream);
}

protected override Object LoadResource(Uri uri, ContentResolver contentResolver)
{
var handle = InputStreamAdapter.ToLocalJniHandle(LoadResource_T(uri, contentResolver));

try
{
return new Object(handle, JniHandleOwnership.TransferLocalRef);
}
finally
{
JNIEnv.DeleteLocalRef(handle);
}
}
}
{
var handle = InputStreamAdapter.ToLocalJniHandle(LoadResource_T(uri, contentResolver));

try
{
return new Object(handle, JniHandleOwnership.TransferLocalRef);
}
finally
{
JNIEnv.DeleteLocalRef(handle);
}
}
}
}

namespace Bumptech.Glide.Load.Engine.Executor
Expand All @@ -196,32 +198,32 @@ public partial class GlideExecutor

namespace Bumptech.Glide.Load.Model
{
public partial class AssetUriLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
public partial class AssetUriLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
BuildLoadData((Uri)model, width, height, options);

public virtual bool Handles(Object model) => Handles((Uri)model);
}

public partial class ByteArrayLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
BuildLoadData(model?.ToArray<byte>(), width, height, options);

public virtual bool Handles(Object model) => Handles(model?.ToArray<byte>());
}

public partial class StringLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
public partial class StringLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
BuildLoadData(model?.ToString(), width, height, options);

public virtual bool Handles(Object model) => Handles(model?.ToString());
}
public partial class FileLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
BuildLoadData((File)model, width, height, options);

public virtual bool Handles(Object model) => Handles((File)model);
Expand All @@ -236,16 +238,16 @@ public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int he
}

public partial class UriLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
BuildLoadData((Uri)model, width, height, options);

public virtual bool Handles(Object model) => Handles((Uri)model);
}

public partial class UrlUriLoader
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
{
public virtual ModelLoaderLoadData BuildLoadData(Object model, int width, int height, Options options) =>
BuildLoadData((Uri)model, width, height, options);

public virtual bool Handles(Object model) => Handles((Uri)model);
Expand Down Expand Up @@ -280,40 +282,40 @@ public bool Handles(Object source, Options options)
namespace Bumptech.Glide.Load.Resource.Gif
{
public partial class GifDrawableEncoder
{
{
public virtual unsafe bool Encode(Object data, global::Java.IO.File file, global::Bumptech.Glide.Load.Options options)
=> Encode((IResource)data, file, options);
}
}

namespace Bumptech.Glide.Load.Resource.Bitmap
{
public partial class BitmapDrawableEncoder
{
public virtual bool Encode(Object data, Java.IO.File file, Options options) => Encode((IResource)data, file, options);
public partial class BitmapDrawableEncoder
{
public virtual bool Encode(Object data, Java.IO.File file, Options options) => Encode((IResource)data, file, options);
}

public partial class BitmapEncoder
{
public virtual bool Encode(Object data, Java.IO.File file, Options options) => Encode((IResource)data, file, options);
{
public virtual bool Encode(Object data, Java.IO.File file, Options options) => Encode((IResource)data, file, options);
}

public partial class StreamBitmapDecoder : IResourceDecoder
{
IResource IResourceDecoder.Decode(Object source, int width, int height, Options options)
{
var stream = InputStreamInvoker.FromJniHandle(source.Handle, JniHandleOwnership.DoNotTransfer);
{
IResource IResourceDecoder.Decode(Object source, int width, int height, Options options)
{
var stream = InputStreamInvoker.FromJniHandle(source.Handle, JniHandleOwnership.DoNotTransfer);

return Decode(stream, width, height, options);
}
return Decode(stream, width, height, options);
}

bool IResourceDecoder.Handles(Object source, Options options)
{
var stream = InputStreamInvoker.FromJniHandle(source.Handle, JniHandleOwnership.DoNotTransfer);
bool IResourceDecoder.Handles(Object source, Options options)
{
var stream = InputStreamInvoker.FromJniHandle(source.Handle, JniHandleOwnership.DoNotTransfer);

return Handles(stream, options);
}
}
return Handles(stream, options);
}
}
}

namespace Bumptech.Glide.Request
Expand Down Expand Up @@ -341,7 +343,7 @@ public partial class RequestOptions
public virtual RequestOptions EncodeFormat(Bitmap.CompressFormat format) => (RequestOptions)EncodeFormat_T(format);

public virtual RequestOptions EncodeQuality(int quality) => (RequestOptions)EncodeQuality_T(quality);

public virtual RequestBuilder Error(Drawable drawable) => (RequestBuilder)Error_T(drawable);

public virtual RequestOptions Error(int resourceId) => (RequestOptions)Error_T(resourceId);
Expand Down
8 changes: 4 additions & 4 deletions Android/Glide/source/Xamarin.Android.Glide/Xamarin.Android.Glide.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PropertyGroup>
<Title>Glide for Xamarin.Android</Title>
<PackageDescription>Xamarin.Android bindings for Glide</PackageDescription>
<PackageVersion>4.12.0.2</PackageVersion>
<PackageVersion>4.13.2.0</PackageVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,9 +20,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.3.6.1" />
<PackageReference Include="Xamarin.AndroidX.ExifInterface" Version="1.3.3" />
<PackageReference Include="Xamarin.AndroidX.VectorDrawable.Animated" Version="1.1.0.8" />
<PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.5.0" />
<PackageReference Include="Xamarin.AndroidX.ExifInterface" Version="1.3.3.6" />
<PackageReference Include="Xamarin.AndroidX.VectorDrawable.Animated" Version="1.1.0.14" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading