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

Weekly Stable Updates 20241101 #1033

Merged
merged 8 commits into from
Nov 6, 2024
Merged

Weekly Stable Updates 20241101 #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8441a03
binderator green
moljac Nov 3, 2024
5ab1c9c
metadata fixes
moljac Nov 4, 2024
21747b0
binderator missin version fix
moljac Nov 4, 2024
cafe473
automagic files
moljac Nov 4, 2024
b0434db
fixes for new config.json
moljac Nov 4, 2024
8b11bf8
fixes for new config.json structure
moljac Nov 4, 2024
cab13d3
Look for missing <dependency.version> in <dependencyManagement> section.
jpobst Nov 4, 2024
5659d57
Merge branch 'main' into wsu-20241101
moljac Nov 6, 2024
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
449 changes: 231 additions & 218 deletions cgmanifest.json
View file
Open in desktop

Large diffs are not rendered by default.

431 changes: 219 additions & 212 deletions config.json
View file
Open in desktop

Large diffs are not rendered by default.

979 changes: 490 additions & 489 deletions docs/artifact-list-with-versions.md
View file
Open in desktop

Large diffs are not rendered by default.

795 changes: 398 additions & 397 deletions docs/artifact-list.md
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion published-namespaces.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,9 @@ AndroidX.Camera.Core.Concurrent
AndroidX.Camera.Core.ImageCaptures
AndroidX.Camera.Core.Impl
AndroidX.Camera.Core.Impl.Annotation
AndroidX.Camera.Core.Impl.Capability
AndroidX.Camera.Core.Impl.Compat
AndroidX.Camera.Core.Impl.Quirk
AndroidX.Camera.Core.Impl.Stabilization
AndroidX.Camera.Core.Impl.Utils
AndroidX.Camera.Core.Impl.Utils.Executors
AndroidX.Camera.Core.Impl.Utils.Futures
Expand All @@ -283,6 +284,8 @@ AndroidX.Camera.Core.Internal.Compat.Quirk
AndroidX.Camera.Core.Internal.Compat.Workaround
AndroidX.Camera.Core.Internal.Utils
AndroidX.Camera.Core.Processing
AndroidX.Camera.Core.Processing.Concurrent
AndroidX.Camera.Core.Processing.Util
AndroidX.Camera.Core.ResolutionSelector
AndroidX.Camera.Core.StreamSharing
AndroidX.Camera.Extensions
Expand All @@ -301,6 +304,8 @@ AndroidX.Camera.Video.Internal.Encoder
AndroidX.Camera.Video.Internal.Utils
AndroidX.Camera.Video.Internal.Workaround
AndroidX.Camera.View
AndroidX.Camera.View.Impl
AndroidX.Camera.View.Internal
AndroidX.Camera.View.Internal.Compat.Quirk
AndroidX.Camera.View.Transform
AndroidX.Camera.View.Video
Expand Down Expand Up @@ -352,13 +357,15 @@ AndroidX.Compose.Material3.Tokens
AndroidX.Compose.Material3.WindowSizeClass
AndroidX.Concurrent.Futures
AndroidX.ConstraintLayout.Core
AndroidX.ConstraintLayout.Core.Dsl
AndroidX.ConstraintLayout.Core.Motion
AndroidX.ConstraintLayout.Core.Motion.Key
AndroidX.ConstraintLayout.Core.Motion.Parse
AndroidX.ConstraintLayout.Core.Motion.Utils
AndroidX.ConstraintLayout.Core.Parser
AndroidX.ConstraintLayout.Core.State
AndroidX.ConstraintLayout.Core.State.Helpers
AndroidX.ConstraintLayout.Core.Utils
AndroidX.ConstraintLayout.Core.Widgets
AndroidX.ConstraintLayout.Core.Widgets.Analyzer
AndroidX.ConstraintLayout.Helper.Widget
Expand Down
5 changes: 0 additions & 5 deletions source/androidx.camera/camera-core/Additions/ImageAnalysisBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ Java.Lang.Object ITargetConfigBuilder.SetTargetName (string name)
{
return SetTargetName (name);
}

Java.Lang.Object IUseCaseEventConfigBuilder.SetUseCaseEventCallback (IEventCallback p0)
{
return SetUseCaseEventCallback (p0);
}
}
}
}
5 changes: 0 additions & 5 deletions source/androidx.camera/camera-core/Additions/ImageCaptureBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ Java.Lang.Object ITargetConfigBuilder.SetTargetName (string name)
{
return SetTargetName (name);
}

Java.Lang.Object IUseCaseEventConfigBuilder.SetUseCaseEventCallback (IEventCallback p0)
{
return SetUseCaseEventCallback (p0);
}
}
}
}
5 changes: 0 additions & 5 deletions source/androidx.camera/camera-core/Additions/PreviewBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ Java.Lang.Object ITargetConfigBuilder.SetTargetName (string name)
{
return SetTargetName (name);
}

Java.Lang.Object IUseCaseEventConfigBuilder.SetUseCaseEventCallback (IEventCallback p0)
{
return SetUseCaseEventCallback (p0);
}
}
}
}
13 changes: 13 additions & 0 deletions source/androidx.camera/camera-core/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,17 @@
Java.Lang.Object
</attr>

<attr
path="/api/package[@name='androidx.camera.core.impl']/class[@name='QuirkSettingsLoader']/method[@name='apply' and count(parameter)=1 and parameter[1][@type='android.content.Context']]/parameter[1]"
name="managedType"
>
Java.Lang.Object
</attr>
<attr
path="/api/package[@name='androidx.camera.core.impl']/class[@name='QuirkSettingsLoader']/method[@name='apply' and count(parameter)=1 and parameter[1][@type='android.content.Context']]"
name="managedReturn"
>
Java.Lang.Object
</attr>

</metadata>
6 changes: 5 additions & 1 deletion source/androidx.core/core/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@
name="no-alternatives"
>
true
</attr>
</attr>

<remove-node
path="/api/package[@name='androidx.core.os']/class[@name='ProfilingRequestBuilder']/method[@name='getThis' and count(parameter)=0]"
/>

</metadata>
7 changes: 7 additions & 0 deletions source/androidx.work/work-runtime/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,11 @@
Java.Lang.Object
</attr>

<attr
path="/api/package[@name='androidx.work']/class[@name='DefaultWorkerFactory']/method[@name='createWorker' and count(parameter)=3 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='androidx.work.WorkerParameters']]"
name="managedReturn"
>
AndroidX.Work.ListenableWorker
</attr>

</metadata>
8 changes: 8 additions & 0 deletions util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/BindingProjectConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,14 @@ static void FixDependency (BindingConfig config, MavenArtifactConfig mavenArtifa

var version = dependency.Version;

// If <version> was empty, look for a matching <dependencyManagement> entry
if (string.IsNullOrWhiteSpace (version)) {
var dep_man_dep = project.DependencyManagement?.Dependencies?.FirstOrDefault (d => d.GroupAndArtifactId () == dependency.GroupAndArtifactId ());

if (dep_man_dep is not null)
version = dep_man_dep.Version;
}

if (string.IsNullOrWhiteSpace (version))
return;

Expand Down
35 changes: 22 additions & 13 deletions utilities.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,25 +1093,24 @@ Task ("api-diff-markdown-info-pr")
idx_start = i;
}
if(line.Contains("dependencyOnly"))
if (line.StartsWith("-"))
{
if (line.StartsWith("-"))
string next_line = lines[i + 1];
if (next_line.StartsWith("-"))
{
continue;
idx_stop = i;
}
idx_stop = i;
}
if (idx_start != -1 && idx_stop != -1)
{
changelog_block = lines.GetRange(idx_start, idx_stop - idx_start);
changelog_block = lines.GetRange(idx_start, idx_stop - idx_start + 4);
changelog_blocks.Add(changelog_block);
idx_start = -1;
idx_stop = -1;
}
}
foreach (List<string> changelog_block_lines in changelog_blocks)
{
string g = null;
Expand Down Expand Up @@ -1142,8 +1141,11 @@ Task ("api-diff-markdown-info-pr")
continue;
}
v_artifact_old = ParseDiffLine(line, "version");
continue;
if (line.StartsWith("-"))
{
v_artifact_old = ParseDiffLine(line, "version");
continue;
}
}
if (line.Contains("nugetVersion"))
Expand All @@ -1169,7 +1171,7 @@ Task ("api-diff-markdown-info-pr")
}
string changelog_line = $"- `{g}:{a}` - {v_artifact_old} -> {v_artifact_new}";
Information(changelog_line);
changelog.Add(changelog_line);
}
Expand Down Expand Up @@ -1231,18 +1233,25 @@ Task ("api-diff-analysis")
Information( $"Directory = {d}");
Information( $" nugetId = {d.GetDirectoryName()}");
bool dependencyOnly = true;
bool? dependencyOnly = true;
string groupId = null;
string artifactId = null;
string nugetId = null;
string nugetVersion = null;
// no guarantees thta config.json is sorted, so linear "search"
// no guarantees that config.json is sorted, so linear "search"
// TODO: sort + (LINQ or binary serch)
foreach(JObject jo in binderator_json_array[0]["artifacts"])
{
dependencyOnly = (bool) jo["dependencyOnly"];
try
{
dependencyOnly = (bool) jo["dependencyOnly"];
}
catch
{
dependencyOnly = null;
}
if ( dependencyOnly == true)
if ( dependencyOnly == null || dependencyOnly == true)
{
continue;
}
Expand Down