Fix issue 439 reqiured api 31 #453

moljac · 2021-12-24T09:13:02Z

Does this change any of the generated binding API's?

yes. Downgraded versions to republish nuget packages.

Describe your contribution

Fix for #444

jpobst

Looks close, we're going to need to update this, or else the .targets files end up in monoandroid90 in the NuGet and won't be found:

https://github.com/xamarin/AndroidX/blob/fix-issue-439-reqiured-api-31/Directory.Build.props#L25-L28

Because these locations are shared among all templates in this repo, I think we'll also have to update all the templates that use .targets files (Kotlin/KotlinX) to be MonoAndroid12.0. Or else we'll be putting their .targets files in /monoandroid12.0 when they are still expecting 9.0.

jonathanpeppers · 2022-01-11T14:13:34Z

templates/auto-value/Targets.cshtml

+
+  <ItemGroup>
+    @foreach (var art in @Model.MavenArtifacts) {
+    <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\@(art.MavenArtifactId)-@(art.MavenArtifactVersion).jar" />


Anywhere you use @(AndroidJavaLibrary) make sure you check $(AndroidApplication) like we do here:

AndroidX/source/AndroidXTargets.cshtml

Line 51 in f97553f

<AndroidJavaLibrary Condition=" '$(AndroidApplication)' == 'true' " Include="$(MSBuildThisFileDirectory)..\..\jar\@(art.MavenGroupId).@(art.MavenArtifactId).jar">

Otherwise developers' class libraries will "redistribute" this file.

yes. Working on that and not all artifacts in template sets are jars!!!! (BuildActions)

here:

https://github.com/xamarin/AndroidX/blob/f97553ff428f9b6ea754f173567d220048245a16/source/AndroidXTargets.cshtml#L47-L53

*.aar wil not be redistributed? Or do libraries remove *.aars?

@jpobst @jonathanpeppers

@jpobst You added kotlin and kotlinx tamplate sets and they have @(AndroidJavaLibrary). Should I (can I) fix that too?

@(AndroidAarLibrary) is fine because it doesn't do anything in a class library. I would fix @(AndroidJavaLibrary) to check for $(AndroidApplication) if you find it in other places.

@jpobst You added kotlin and kotlinx tamplate sets and they have @(AndroidJavaLibrary). Should I (can I) fix that too?

Yes, looks like those use <InputJar> and package a loose .jar, so they should be updated.

jonathanpeppers · 2022-01-11T14:13:48Z

templates/gson/Targets.cshtml

+
+  <ItemGroup>
+    @foreach (var art in @Model.MavenArtifacts) {
+    <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\@(art.MavenArtifactId)-@(art.MavenArtifactVersion).jar" />


Check $(AndroidApplication).

I'm not sure I understand why we are adding these Targets.cshtml files in the first place. My understanding is we do not need them because these packages are using <EmbeddedJar>. We are not including the loose .jar file in the NuGet, so these Includes point to a file that doesn't exist.

kotlin - InputJar
kotlinx - InputJar also
other template sets are EmbeddedJar.

Should I make them InputJar and maybe we could share artifact and make nuget smaller?

otherwise it would be embedded twice... Or am I wrong?

I think we should focus this PR on fixing #439, and if there are additional unrelated changes we want to make we can handle them in separate PRs.

jonathanpeppers · 2022-01-11T14:14:13Z

templates/reactive-streams/Targets.cshtml

+
+  <ItemGroup>
+    @foreach (var art in @Model.MavenArtifacts) {
+    <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\@(art.MavenArtifactId)-@(art.MavenArtifactVersion).jar" />


Another check for $(AndroidApplication).

jonathanpeppers · 2022-01-11T14:14:20Z

templates/rxjava/Targets.cshtml

+
+  <ItemGroup>
+    @foreach (var art in @Model.MavenArtifacts) {
+    <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\@(art.MavenArtifactId)-@(art.MavenArtifactVersion).jar" />


Another check for $(AndroidApplication).

jonathanpeppers · 2022-01-11T14:14:26Z

templates/tink/Targets.cshtml

+
+  <ItemGroup>
+    @foreach (var art in @Model.MavenArtifacts) {
+    <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\@(art.MavenArtifactId)-@(art.MavenArtifactVersion).jar" />


Another check for $(AndroidApplication).

…' == 'true`'

moljac · 2022-01-12T14:32:59Z

/azp run

azure-pipelines · 2022-01-12T14:33:12Z

Azure Pipelines successfully started running 1 pipeline(s).

moljac · 2022-01-18T12:01:00Z

Note:

reported as removed, but available in the API:

#### Removed Type AndroidX.AppCompat.Graphics.Drawable.AnimatedStateListDrawableCompat
#### Removed Type AndroidX.AppCompat.Graphics.Drawable.DrawableContainer
#### Removed Type AndroidX.AppCompat.Graphics.Drawable.DrawableWrapper
### Removed Namespace AndroidX.AppCompat.Widget


#### Removed Type AndroidX.AppCompat.Widget.DrawableUtils
#### Removed Type AndroidX.AppCompat.Widget.ResourceManagerInternal
#### Removed Type AndroidX.AppCompat.Widget.TintContextWrapper
#### Removed Type AndroidX.AppCompat.Widget.TintInfo
#### Removed Type AndroidX.AppCompat.Widget.VectorEnabledTintResources



#### Removed Type AndroidX.Window.Layout.WindowLayoutInfo.Builder

#### Removed Type AndroidX.Window.Layout.IWindowInfoRepository
#### Removed Type AndroidX.Window.Layout.IWindowInfoRepositoryDecorator
#### Removed Type AndroidX.Window.Layout.WindowInfoRepository
#### Removed Type AndroidX.Window.Layout.WindowInfoRepositoryCompanion


#### Removed Type AndroidX.Window.Java.Layout.WindowInfoRepositoryCallbackAdapter

This reverts commit 19f2ec4.

jpobst

I think we still need to do this:

Looks close, we're going to need to update this, or else the .targets files end up in monoandroid90 in the NuGet and won't be found:

https://github.com/xamarin/AndroidX/blob/fix-issue-439-reqiured-api-31/Directory.Build.props#L25-L28

Because these locations are shared among all templates in this repo, I think we'll also have to update all the templates that use .targets files (Kotlin/KotlinX) to be MonoAndroid12.0. Or else we'll be putting their .targets files in /monoandroid12.0 when they are still expecting 9.0.

jpobst · 2022-01-20T18:04:34Z

source/AndroidXProject.cshtml

@@ -2,7 +2,8 @@
 @using System.Linq
 <Project Sdk="Xamarin.Legacy.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>MonoAndroid9.0;net6.0-android</TargetFrameworks>
+    <TargetFrameworks>MonoAndroid12.0;net6.0-android</TargetFrameworks>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>


Is <AndroidUseLatestPlatformSdk> needed?

Apparently it is deprecated and should not be used anymore:
https://github.com/xamarin/xamarin-forms-samples/issues/364

moljac added 6 commits December 21, 2021 08:36

downgraded package versions

d9fb8de

MonoAndroid12.0 instead of MonoAndroid9.0

be63ee7

azure-pipelines.yml version bumps

7941a5a

samples fixed for monoandroid12.0

497b889

tests fixed for monoandroid12.0

317c22b

mappings

01d7be2

jpobst reviewed Jan 10, 2022

View reviewed changes

moljac added 2 commits January 11, 2022 13:01

fixing targets for template sets

672329b

Update dependencies.json

91d1864

jonathanpeppers reviewed Jan 11, 2022

View reviewed changes

moljac added 7 commits January 11, 2022 15:52

targets fixes for aar and added `Condition=" '$(AndroidApplication)…

2b863c6

…' == 'true`'

added Condition=" '$(AndroidApplication)' == 'true'

4b47596

target files removed

ec986b8

Update dependencies.json

a1f84dd

target files removed

b1b734d

target files removed

f1e9dd6

Condition=" '$(AndroidApplication)' == 'true' and artifact version fix

a4f5ba1

moljac added 3 commits January 14, 2022 06:34

Update dependencies.json

7f49f68

utilities.cake nuget-analysis target added

6cadda0

target renamed

5bafe42

moljac added 3 commits January 18, 2022 13:26

nuget structure analysis in utilities.cake

61f4d91

dotnet version bumps

19f2ec4

Revert "dotnet version bumps"

73d9eb8

This reverts commit 19f2ec4.

moljac mentioned this pull request Jan 19, 2022

Weekly Stable Updates 20211202 #436

Merged

jpobst reviewed Jan 20, 2022

View reviewed changes

switch to MonoAndroid12.0

7f3133a

jpobst approved these changes Jan 24, 2022

View reviewed changes

moljac merged commit 0cf7ce5 into main Jan 24, 2022

moljac deleted the fix-issue-439-reqiured-api-31 branch January 24, 2022 16:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix issue 439 reqiured api 31 #453

Fix issue 439 reqiured api 31 #453

moljac commented Dec 24, 2021

jpobst left a comment •

edited

Loading

jonathanpeppers Jan 11, 2022

moljac Jan 11, 2022

moljac Jan 11, 2022

moljac Jan 11, 2022

jonathanpeppers Jan 11, 2022

jpobst Jan 11, 2022

jonathanpeppers Jan 11, 2022

jpobst Jan 11, 2022

moljac Jan 11, 2022

moljac Jan 11, 2022

jpobst Jan 11, 2022

jonathanpeppers Jan 11, 2022

jonathanpeppers Jan 11, 2022

jonathanpeppers Jan 11, 2022

moljac commented Jan 12, 2022

azure-pipelines bot commented Jan 12, 2022

moljac commented Jan 18, 2022 •

edited

Loading

jpobst left a comment

jpobst Jan 20, 2022

Fix issue 439 reqiured api 31 #453

Fix issue 439 reqiured api 31 #453

Conversation

moljac commented Dec 24, 2021

Does this change any of the generated binding API's?

Describe your contribution

jpobst left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moljac commented Jan 12, 2022

azure-pipelines bot commented Jan 12, 2022

moljac commented Jan 18, 2022 • edited Loading

jpobst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jpobst left a comment •

edited

Loading

moljac commented Jan 18, 2022 •

edited

Loading