xamarin
/
AndroidX
зеркало из https://github.com/xamarin/AndroidX.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
3 739 коммитов 23 Ветки 236 Теги 111 MiB
Граф коммитов

3739 Коммитов

Автор SHA1 Сообщение Дата
moljac ae82f27b10 metadata fixes according to review 2024-07-18 20:30:19 +02:00
moljac 7cf6b7e9bb Update artifact-list-with-versions.md 2024-07-14 10:11:22 +02:00
moljac 136d29e966
Merge branch 'main' into mu-20230329-androidx.media.players 2024-07-13 14:33:07 +02:00
moljac ee74691698
Merge pull request #922 from xamarin/mu-20240712-alignment-bumps 
Manual updates 20240712 alignment bumps
 2024-07-12 23:47:39 +02:00
moljac 58c9dac648 automatic files 2024-07-12 17:04:09 +02:00
moljac f07b8427b0 Update config.json 2024-07-12 16:18:44 +02:00
moljac cb998e373b
Merge branch 'main' into mu-20230329-androidx.media.players 2024-07-08 18:09:31 +02:00
moljac 7f7feb8b78
Merge pull request #921 from xamarin/wsu-20240704 
Weekly Stable Updates 20240704
 2024-07-08 17:13:26 +02:00
moljac 7d983f2a6e changes from main branch 2024-07-08 16:58:18 +02:00
moljac 6c2e869903 automtic files 2024-07-08 16:57:50 +02:00
moljac 74b9579cec Update Metadata.xml 2024-07-06 17:41:58 +02:00
moljac b07b9f5d62 automatic files 2024-07-06 17:40:16 +02:00
moljac 742f88a8b0 Update config.json 2024-07-06 17:39:42 +02:00
moljac 393a3a859d
Merge branch 'main' into mu-20230329-androidx.media.players 2024-07-05 07:52:30 +02:00
moljac 6053520760 automatic files 2024-07-05 07:49:58 +02:00
moljac 0c42bb7083 added package patterns for samples 2024-07-05 07:49:48 +02:00
moljac d31896a9d2 Update Metadata.xml 2024-07-05 07:49:32 +02:00
moljac da8659912d removed problematic artifacts 2024-07-05 07:49:09 +02:00
Jonathan Pobst 0d9339b4e8
Ignore `nuget-diff` error for now. (#917) 
Context: https://github.com/xamarin/AndroidX/issues/916

`api-diff` currently fails for `Xamarin.AndroidX.Car.App.App` `1.4.0` which is preventing us from updating it.  The nature of this crash is documented in https://github.com/xamarin/AndroidX/issues/916.

We have chosen not to spend the resources at this time to fix this tooling error.  Instead, we are going to go ahead and update `Xamarin.AndroidX.Car.App.App` to version `1.4.0` and are going to exclude it from running `api-diff`.
 2024-07-03 14:09:53 -05:00
moljac 4daba3f53d
Merge branch 'main' into mu-20230329-androidx.media.players 2024-07-02 16:22:40 +02:00
moljac 5f56d14add
Merge pull request #915 from xamarin/wsu-20240627 
Weekly stable updates 20240627
 2024-07-01 18:00:45 +02:00
moljac c9e6c41d2f automatic files 2024-07-01 06:16:16 +02:00
moljac c1a00f4bd8 downgraded Xamarin.AndroidX.Car.App.App 2024-06-30 22:58:19 +02:00
moljac 7a31fc01bd
Merge branch 'main' into wsu-20240627 2024-06-30 22:18:24 +02:00
moljac f881dbdfa2 binderator green 2024-06-30 22:17:39 +02:00
moljac e9cd29d06e
Merge branch 'main' into mu-20230329-androidx.media.players 2024-06-30 22:15:12 +02:00
Jonathan Pobst 8ebc702cfc
Fix duplicate DataStore.Core.[Android|Jvm] code. (#906) 
Fixes: https://github.com/xamarin/GooglePlayServicesComponents/issues/880

If you try to consume the package `Xamarin.AndroidX.DataStore.Preferences`, you get the following error:

```
JAVA0000: Error in C:\.tools\.nuget\packages\xamarin.androidx.datastore.core.jvm\1.1.1.2\buildTransitive\net8.0-android34.0\..\..\jar\androidx.datastore.datastore-core-jvm.jar:androidx/datastore/core/Actual_jvmKt.class:
JAVA0000: Type androidx.datastore.core.Actual_jvmKt is defined multiple times: 
- C:\.tools\.nuget\packages\xamarin.androidx.datastore.core.jvm\1.1.1.2\buildTransitive\net8.0-android34.0\..\..\jar\androidx.datastore.datastore-core-jvm.jar:androidx/datastore/core/Actual_jvmKt.class, 
- obj\Release\net8.0-android\lp\30\jl\classes.jar:androidx/datastore/core/Actual_jvmKt.class
```

This is because through the complex set of dependencies, you end up using these 2 packages:

- `Xamarin.AndroidX.DataStore.Core.Android`
- `Xamarin.AndroidX.DataStore.Core.Jvm`

These packages contain the same Java code, the `Android` one seems to be a superset of the `Jvm` one:

![image](https://github.com/xamarin/AndroidX/assets/179295/cf40d9e5-bc26-4811-bbb9-793b28e4d83b)

Thus we believe the solution is to redirect the `Jvm` package to the `Android` one.  That is, anytime the `Jvm` package is requested we are going to give it the `Android` one instead.

We will accomplish this via:

- Adding `Xamarin.AndroidX.DataStore.Core.Android` as a dependency of `Xamarin.AndroidX.DataStore.Core.Jvm`.  This means anytime `Jvm` is requested `Android` will also be added.
- Removing the `Jvm` Java library and its bindings from `Xamarin.AndroidX.DataStore.Core.Jvm` so that it will no longer duplicate the bindings and Java library in `Android`.

With these changes, we no longer see the conflict errors when consuming the `Xamarin.AndroidX.DataStore.Preferences*` packages in the `ExtendedTests` suite.

Additionally, bump all the `androidx.datastore` packages so that this new version will get picked up.
 2024-06-28 08:46:31 -05:00
Jonathan Pobst 1bd273c70b
Add type forwards for `AndroidX.Lifecycle*` `2.8.*` changes. (#908) 
Context: https://github.com/xamarin/AndroidX/pull/863
Fixes: https://github.com/dotnet/android/issues/9049
Fixes: https://github.com/xamarin/AndroidX/issues/909

In version `2.8.*`, Google moved all the types in 2 libraries into 2 new libraries:
- `Xamarin.AndroidX.Lifecycle.Common` to `Xamarin.AndroidX.Lifecycle.Common.Jvm`.  
- `Xamarin.AndroidX.Lifecycle.ViewModel` to `Xamarin.AndroidX.Lifecycle.ViewModel.Android`.  

While this is a source compatible change for users, it is not a binary compatible change for users that are relying on NuGets or assemblies that have not been recompiled.

These types may continue to work in Debug builds, but the linker and AOT compiler steps run for Release builds are unable to resolve the moved types, causing unfixable errors (other than recompiling all assemblies).

Adding `[TypeForwardedToAttribute]` attributes allows the linker and AOT to succeed without recompiling old assemblies.
 2024-06-27 14:30:57 -05:00
moljac 40db35e9ba
Merge pull request #911 from xamarin/mu-20240625-editorconfig 
Manual updates 20240625 - .editorconfig
 2024-06-25 22:01:50 +02:00
moljac 4ec8a6ccda
Merge branch 'main' into mu-20240625-editorconfig 2024-06-25 22:01:35 +02:00
moljac 2bfad0f869
Merge pull request #910 from xamarin/wsu-20240621 
Weekly stable updates 20240621
 2024-06-25 21:59:50 +02:00
moljac 8edce19a6b
Merge branch 'main' into wsu-20240621 2024-06-25 21:59:28 +02:00
Jonathan Pryor ed4f069a95
Fix whitespace 2024-06-25 15:57:31 -04:00
moljac fa587b8234
Merge pull request #907 from xamarin/remove-custom-generator 
[build] Remove custom `generator` usage.
 2024-06-25 21:56:25 +02:00
moljac 02eaefad7d Create .editorconfig 2024-06-25 20:07:27 +02:00
moljac 139b0188a2 fixes according to review 2024-06-25 19:37:30 +02:00
moljac 22e2b7801e formatting fixed according to review 2024-06-25 19:13:38 +02:00
moljac 709839bd26 automatic files 2024-06-21 17:34:29 +02:00
moljac 766f085b62 downgraded Xamarin.AndroidX.Car.App.App 2024-06-21 17:34:15 +02:00
Jonathan Pobst fce72a950a [build] Remove custom `generator` usage. 2024-06-21 08:53:00 -05:00
moljac a695e3033f metadata fixes 2024-06-21 14:19:26 +02:00
moljac 84f7bb4f50 files moved to correct location 2024-06-21 13:05:14 +02:00
moljac fa538b09bd ProtoOneOfImpl fixes 2024-06-21 12:36:52 +02:00
moljac 7e77ab0c46 binderator green 2024-06-21 12:36:24 +02:00
moljac bbc69a5e0e
Merge branch 'main' into mu-20230329-androidx.media.players 2024-06-21 00:15:43 +02:00
moljac 6d0c74d6df
Merge pull request #901 from xamarin/mu-20240606-late-updates-catch-up 
Weekly stable updates 20240606 late updates in the queue
 2024-06-20 23:58:59 +02:00
moljac 2df45ef834 automatic files 2024-06-18 21:01:16 +02:00
moljac 6acb9ace29 cleanup 2024-06-18 20:38:12 +02:00
moljac fabfe894ab stable version of Xamarin.AndroidX.Security.SecurityCrypto 2024-06-18 20:28:13 +02:00
moljac 8163d706ca automatic files 2024-06-18 15:42:24 +02:00