Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
69be9e8
Weekly stable updates
jpobst Nov 1, 2021
1e07c81
window beta03 bumps
moljac Nov 2, 2021
4a84d0e
metadata fixes
moljac Nov 2, 2021
10ac50d
mappings
moljac Nov 2, 2021
817890d
tests fixes and nuget updates
moljac Nov 2, 2021
59f4bb9
BuildAll sample updates
moljac Nov 2, 2021
8d845d3
fix for aapt2 error with AndroidX.Core 1.7.0 (explicit version 1.6.0)
moljac Nov 3, 2021
81b8540
namespaces fixes in metadata
moljac Nov 3, 2021
c384bb8
Merge branch 'main' into create-pull-request/patch-1635746820
moljac Nov 3, 2021
616f255
regenerated dependencies.json
moljac Nov 4, 2021
d803fe6
JavaSourceJar and JavaDocJar path fix
moljac Nov 9, 2021
178be2f
turned off parameter tools JavaSourceJar and JavaDocJar
moljac Nov 11, 2021
e9ead07
comment for future formatting
moljac Nov 11, 2021
d5b18cd
Revert "metadata fixes"
moljac Nov 11, 2021
7ba5d15
metadata fixes
moljac Nov 12, 2021
09ed59c
Update dependencies.json
moljac Nov 12, 2021
89fe734
JavaDocJar parameter generation turned on
moljac Nov 16, 2021
4bd119d
typo (closing comment)
moljac Nov 16, 2021
e537e98
Update dependencies.json
moljac Nov 16, 2021
eb4c3de
turn on JavaSourceJar only for Xamarin.AndroidX.Core
moljac Nov 18, 2021
92ac7c9
Update dependencies.json
moljac Nov 18, 2021
2bb3e99
XCode, Binderator, dotnet version bumps
moljac Nov 19, 2021
754da11
bump Xamarin.AndroidX.Window version
moljac Nov 19, 2021
b38f3c7
more androidx.window version bumps
moljac Nov 19, 2021
a90f34d
Update dependencies.json
moljac Nov 19, 2021
4f0dcd2
macosImage: 'macOS-11'
moljac Nov 22, 2021
a2248ca
dotnet versions specified
moljac Nov 22, 2021
cde54fa
dotnet 5.0.403 for binderator
moljac Nov 22, 2021
c80e36e
Revert "metadata fixes"
jpobst Nov 30, 2021
e536263
Use metadata from 1.6.0 to restore parameter names for AndroidX.Core.
jpobst Nov 30, 2021
08a6f89
Merge pull request #432 from xamarin/core-parameternames
moljac Dec 1, 2021
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
10 changes: 7 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ pr:
- main

variables:
AndroidBinderatorVersion: 0.5.0
AndroidBinderatorVersion: 0.5.2
AndroidXMigrationVersion: 1.0.8
DotNetVersion: 6.0.100-rc.2.21505.57
DotNetVersion: 6.0.100
DotNet6Source: https://aka.ms/dotnet6/nuget/index.json
NuGetOrgSource: https://api.nuget.org/v3/index.json
# NOTE: there wasn't a public release of 16.11 for macOS
Expand Down Expand Up @@ -37,7 +37,11 @@ jobs:
timeoutInMinutes: 120
validPackagePrefixes: [ 'Xamarin', 'GoogleGson' ]
areaPath: 'DevDiv\VS Client - Runtime SDKs\Android'
xcode: 13.0
macosImage: 'macOS-11' # the name of the macOS VM image
# BigSur 20211120
xcode: 13.1
dotnet: '5.0.403' # the version of .NET Core to use
dotnetStable: '3.1.415' # the stable version of .NET Core to use
initSteps:
- task: UseDotNet@2
displayName: install .NET $(DotNetVersion)
Expand Down
138 changes: 69 additions & 69 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
{
"groupId": "androidx.activity",
"artifactId": "activity",
"version": "1.3.1",
"nugetVersion": "1.3.1.2",
"version": "1.4.0",
"nugetVersion": "1.4.0",
"nugetId": "Xamarin.AndroidX.Activity",
"dependencyOnly": false
},
{
"groupId": "androidx.activity",
"artifactId": "activity-ktx",
"version": "1.3.1",
"nugetVersion": "1.3.1.2",
"version": "1.4.0",
"nugetVersion": "1.4.0",
"nugetId": "Xamarin.AndroidX.Activity.Ktx",
"dependencyOnly": false
},
Expand Down Expand Up @@ -421,8 +421,8 @@
{
"groupId": "androidx.core",
"artifactId": "core",
"version": "1.6.0",
"nugetVersion": "1.6.0.3",
"version": "1.7.0",
"nugetVersion": "1.7.0",
"nugetId": "Xamarin.AndroidX.Core",
"dependencyOnly": false
},
Expand All @@ -445,8 +445,8 @@
{
"groupId": "androidx.core",
"artifactId": "core-ktx",
"version": "1.6.0",
"nugetVersion": "1.6.0.3",
"version": "1.7.0",
"nugetVersion": "1.7.0",
"nugetId": "Xamarin.AndroidX.Core.Core.Ktx",
"dependencyOnly": false
},
Expand Down Expand Up @@ -661,16 +661,16 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-common",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.Common",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-common-java8",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.Common.Java8",
"dependencyOnly": false
},
Expand All @@ -685,104 +685,104 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-livedata",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.LiveData",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-livedata-core",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-livedata-core-ktx",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-livedata-ktx",
"version": "2.3.1",
"nugetVersion": "2.3.1.5",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Ktx",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-process",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.Process",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-reactivestreams",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-reactivestreams-ktx",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams.Ktx",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-runtime",
"version": "2.3.1",
"nugetVersion": "2.3.1.4",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.Runtime",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-runtime-ktx",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.Runtime.Ktx",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-service",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.Service",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-viewmodel",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-viewmodel-ktx",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel.Ktx",
"dependencyOnly": false
},
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-viewmodel-savedstate",
"version": "2.3.1",
"nugetVersion": "2.3.1.3",
"version": "2.4.0",
"nugetVersion": "2.4.0",
"nugetId": "Xamarin.AndroidX.Lifecycle.ViewModelSavedState",
"dependencyOnly": false
},
Expand Down Expand Up @@ -1252,18 +1252,18 @@
},
{
"groupId": "androidx.wear",
"artifactId": "wear-ongoing",
"version": "1.0.0",
"artifactId": "wear-input",
"version": "1.1.0",
"nugetVersion": "1.0.0.0",
"nugetId": "Xamarin.AndroidX.Wear.Ongoing",
"nugetId": "Xamarin.AndroidX.Wear.Input",
"dependencyOnly": false
},
{
"groupId": "androidx.wear",
"artifactId": "wear-input",
"version": "1.1.0",
"artifactId": "wear-ongoing",
"version": "1.0.0",
"nugetVersion": "1.0.0.0",
"nugetId": "Xamarin.AndroidX.Wear.Input",
"nugetId": "Xamarin.AndroidX.Wear.Ongoing",
"dependencyOnly": false
},
{
Expand All @@ -1279,7 +1279,7 @@
"artifactId": "wear-remote-interactions",
"version": "1.0.0",
"nugetVersion": "1.0.0.0",
"nugetId": "Xamarin.AndroidX.Wear.RemoteInteractions",
"nugetId": "Xamarin.AndroidX.Wear.RemoteInteractions",
"dependencyOnly": false
},
{
Expand All @@ -1293,8 +1293,8 @@
{
"groupId": "androidx.window",
"artifactId": "window",
"version": "1.0.0-beta02",
"nugetVersion": "1.0.0.3-beta02",
"version": "1.0.0-beta04",
"nugetVersion": "1.0.0.4-beta04",
"nugetId": "Xamarin.AndroidX.Window",
"dependencyOnly": false
},
Expand All @@ -1309,8 +1309,8 @@
{
"groupId": "androidx.window",
"artifactId": "window-java",
"version": "1.0.0-beta02",
"nugetVersion": "1.0.0.3-beta02",
"version": "1.0.0-beta04",
"nugetVersion": "1.0.0.4-beta04",
"nugetId": "Xamarin.AndroidX.Window.WindowJava",
"dependencyOnly": false
},
Expand Down Expand Up @@ -1350,8 +1350,8 @@
{
"groupId": "com.google.code.gson",
"artifactId": "gson",
"version": "2.8.8",
"nugetVersion": "2.8.8.2",
"version": "2.8.9",
"nugetVersion": "2.8.9",
"nugetId": "GoogleGson",
"dependencyOnly": false,
"templateSet": "gson"
Expand Down Expand Up @@ -1476,6 +1476,15 @@
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-guava",
"version": "1.5.2",
"nugetVersion": "1.5.2",
"nugetId": "Xamarin.KotlinX.Coroutines.Guava",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-jdk8",
Expand Down Expand Up @@ -1503,15 +1512,6 @@
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-guava",
"version": "1.5.0",
"nugetVersion": "1.5.0",
"nugetId": "Xamarin.KotlinX.Coroutines.Guava",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.reactivestreams",
"artifactId": "reactive-streams",
Expand All @@ -1521,14 +1521,6 @@
"dependencyOnly": false,
"templateSet": "reactive-streams"
},
{
"groupId": "com.google.firebase",
"artifactId": "firebase-appindexing",
"version": "20.0.0",
"nugetVersion": "120.0.0.2",
"nugetId": "Xamarin.Firebase.AppIndexing",
"dependencyOnly": true
},
{
"groupId": "com.google.android.gms",
"artifactId": "play-services-basement",
Expand All @@ -1545,6 +1537,14 @@
"nugetId": "Xamarin.GooglePlayServices.Wearable",
"dependencyOnly": true
},
{
"groupId": "com.google.firebase",
"artifactId": "firebase-appindexing",
"version": "20.0.0",
"nugetVersion": "120.0.0.2",
"nugetId": "Xamarin.Firebase.AppIndexing",
"dependencyOnly": true
},
{
"groupId": "com.google.guava",
"artifactId": "failureaccess",
Expand Down Expand Up @@ -1691,4 +1691,4 @@
}
]
}
]
]
16 changes: 8 additions & 8 deletions mappings/androidx-assemblies.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Support .NET assembly,AndroidX .NET assembly,Support NuGet,AndroidX NuGet,AndroidX NuGet Version
Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,2.1.0.11
Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.11
Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.3.1.3
Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.0
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.10
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.3.1.3
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.3.1.3
Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.3.1.3
Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.3.1.3
Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.3.1.4
Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.3.1.3
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.0
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.0
Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.0
Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.4.0
Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.0
Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.0
Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.10
Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.10
Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.0.2
Expand All @@ -23,7 +23,7 @@ Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Andro
Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,22.0.0.2
Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.10
Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.1.0.10
Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0.3
Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.7.0
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.1.1.2
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,7.0.3
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.0.3
Expand Down
2 changes: 1 addition & 1 deletion mappings/androidx-mapping.csv
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ Android.Support.V4.Print,PrintHelper.IOnPrintFinishCallback,AndroidX.Print,Print
Android.Support.V4.Print,PrintHelper.IOnPrintFinishCallbackInvoker,AndroidX.Print,PrintHelper.IOnPrintFinishCallbackInvoker,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,android.support.v4.print,PrintHelper.OnPrintFinishCallback,androidx.print,PrintHelper.OnPrintFinishCallback,
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment.
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment.HolderFragmentManager.
Android.Arch.Lifecycle,ProcessLifecycleOwnerInitializer,AndroidX.Lifecycle,ProcessLifecycleOwnerInitializer,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,android.arch.lifecycle,ProcessLifecycleOwnerInitializer,androidx.lifecycle,ProcessLifecycleOwnerInitializer,
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ProcessLifecycleOwnerInitializer.
Android.Arch.Lifecycle,ServiceLifecycleDispatcher,AndroidX.Lifecycle,ServiceLifecycleDispatcher,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,android.arch.lifecycle,ServiceLifecycleDispatcher,androidx.lifecycle,ServiceLifecycleDispatcher,
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ServiceLifecycleDispatcher.DispatchRunnable.
Android.Arch.Lifecycle,ViewModelStores,AndroidX.Lifecycle,ViewModelStores,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,android.arch.lifecycle,ViewModelStores,androidx.lifecycle,ViewModelStores,
Expand Down
Loading