diff --git a/config.json b/config.json index 1e129111..f0dde912 100644 --- a/config.json +++ b/config.json @@ -25,7 +25,7 @@ { "groupId" : "androidx.annotation", "artifactId" : "annotation", - "version" : "1.0.2", + "version" : "1.1.0", "nugetId" : "Xamarin.AndroidX.Annotation", "dependencyOnly" : false } @@ -67,10 +67,24 @@ ,{ "groupId" : "androidx.core", "artifactId" : "core", - "version" : "1.0.1", + "version" : "1.1.0-rc02", "nugetId" : "Xamarin.AndroidX.Core", "dependencyOnly" : false } + ,{ + "groupId" : "androidx.camera", + "artifactId" : "camera-camera2", + "version" : "1.0.0-alpha03", + "nugetId" : "Xamarin.AndroidX.Camera.Camera2", + "dependencyOnly" : false + } + ,{ + "groupId" : "androidx.camera", + "artifactId" : "camera-core", + "version" : "1.0.0-alpha03", + "nugetId" : "Xamarin.AndroidX.Camera.Core", + "dependencyOnly" : false + } ,{ "groupId" : "androidx.cardview", "artifactId" : "cardview", @@ -85,6 +99,13 @@ "nugetId" : "Xamarin.AndroidX.Collection", "dependencyOnly" : false } + ,{ + "groupId" : "androidx.concurrent", + "artifactId" : "concurrent-futures", + "version" : "1.0.0-alpha03", + "nugetId" : "Xamarin.AndroidX.Concurrent.Futures", + "dependencyOnly" : false + } ,{ "groupId" : "androidx.constraintlayout", "artifactId" : "constraintlayout", @@ -487,7 +508,7 @@ ,{ "groupId" : "androidx.versionedparcelable", "artifactId" : "versionedparcelable", - "version" : "1.0.0", + "version" : "1.1.0-rc01", "nugetId" : "Xamarin.AndroidX.VersionedParcelable", "dependencyOnly" : false } @@ -548,6 +569,13 @@ "nugetId" : "Xamarin.Google.Guava.ListenableFuture", "nugetVersion" : "1.0", "dependencyOnly" : true + }, + { + "groupId" : "com.google.auto.value", + "artifactId" : "auto-value-annotations", + "version" : "1.6.5", + "nugetId" : "Xamarin.Google.AutoValue.Annotations", + "dependencyOnly" : true } ] }] diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml index fe373b16..43556144 100644 --- a/source/AndroidXProject.cshtml +++ b/source/AndroidXProject.cshtml @@ -83,23 +83,23 @@ } - - - + + + - Additions/%(RecursiveDir)/%(Filename)%(Extension) + additions/%(RecursiveDir)/%(Filename)%(Extension) - Transforms/Metadata.common.xml + transforms/Metadata.common.xml - Transforms/%(RecursiveDir)/%(Filename)%(Extension) + transforms/%(RecursiveDir)/%(Filename)%(Extension) diff --git a/source/androidx.appcompat/appcompat/transforms/Metadata.xml b/source/androidx.appcompat/appcompat/transforms/Metadata.xml index 653686dd..762cc6a1 100644 --- a/source/androidx.appcompat/appcompat/transforms/Metadata.xml +++ b/source/androidx.appcompat/appcompat/transforms/Metadata.xml @@ -225,4 +225,5 @@ --> Java.Lang.Object + \ No newline at end of file diff --git a/source/androidx.camera/camera-camera2/transforms/Metadata.xml b/source/androidx.camera/camera-camera2/transforms/Metadata.xml new file mode 100644 index 00000000..b1a3e6e0 --- /dev/null +++ b/source/androidx.camera/camera-camera2/transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.camera/camera-core/transforms/Metadata.xml b/source/androidx.camera/camera-core/transforms/Metadata.xml new file mode 100644 index 00000000..353e510d --- /dev/null +++ b/source/androidx.camera/camera-core/transforms/Metadata.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/source/androidx.core/core/transforms/Metadata.xml b/source/androidx.core/core/transforms/Metadata.xml index 98713294..0d2d33aa 100644 --- a/source/androidx.core/core/transforms/Metadata.xml +++ b/source/androidx.core/core/transforms/Metadata.xml @@ -37,4 +37,6 @@ Android.Views.ScrollAxis + + \ No newline at end of file diff --git a/source/androidx.fragment/fragment/additions/Additions.cs b/source/androidx.fragment/fragment/additions/Additions.cs index 17de03a3..7884d42b 100644 --- a/source/androidx.fragment/fragment/additions/Additions.cs +++ b/source/androidx.fragment/fragment/additions/Additions.cs @@ -6,6 +6,6 @@ namespace AndroidX.Fragment.App { public partial class FragmentActivity { - public override AndroidX.Lifecycle.Lifecycle Lifecycle => base.Lifecycle; + //public override AndroidX.Lifecycle.Lifecycle Lifecycle => base.Lifecycle; } }