diff --git a/cgmanifest.json b/cgmanifest.json index 1e54f28ac..30dfcd939 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -936,6 +936,58 @@ }, "License": "Android Software Development Kit License" }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "app-update", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.App.Update", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "app-update-ktx", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.App.Update.Ktx", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "asset-delivery", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.Asset.Delivery", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "asset-delivery-ktx", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.Asset.Delivery.Ktx", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, { "Component": { "Type": "Maven", @@ -949,6 +1001,84 @@ }, "License": "Play Core Software Development Kit Terms of Service" }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "core-common", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.Core.Common", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "core-ktx", + "GroupId": "com.google.android.play", + "Version": "1.8.1", + "NuGetId": "Xamarin.Google.Android.Play.Core.Ktx", + "NuGetVersion": "1.8.1" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "review", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.Review", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "review-ktx", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.Review.Ktx", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "feature-delivery", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.Feature.Delivery", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, + { + "Component": { + "Type": "Maven", + "Maven": { + "ArtifactId": "feature-delivery-ktx", + "GroupId": "com.google.android.play", + "Version": "2.0.0", + "NuGetId": "Xamarin.Google.Android.Play.Feature.Delivery.Ktx", + "NuGetVersion": "2.0.0" + } + }, + "License": "Play Core Software Development Kit Terms of Service" + }, { "Component": { "Type": "Maven", diff --git a/config.json b/config.json index ce6c69feb..0980cbd2c 100644 --- a/config.json +++ b/config.json @@ -601,6 +601,38 @@ "nugetId": "Xamarin.GooglePlayServices.Wearable", "dependencyOnly": false }, + { + "groupId": "com.google.android.play", + "artifactId": "app-update", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.App.Update", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "app-update-ktx", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.App.Update.Ktx", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "asset-delivery", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.Asset.Delivery", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "asset-delivery-ktx", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.Asset.Delivery.Ktx", + "dependencyOnly": false + }, { "groupId": "com.google.android.play", "artifactId": "core", @@ -609,6 +641,54 @@ "nugetId": "Xamarin.Google.Android.Play.Core", "dependencyOnly": false }, + { + "groupId": "com.google.android.play", + "artifactId": "core-common", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.Core.Common", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "core-ktx", + "version": "1.8.1", + "nugetVersion": "1.8.1", + "nugetId": "Xamarin.Google.Android.Play.Core.Ktx", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "review", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.Review", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "review-ktx", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.Review.Ktx", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "feature-delivery", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.Feature.Delivery", + "dependencyOnly": false + }, + { + "groupId": "com.google.android.play", + "artifactId": "feature-delivery-ktx", + "version": "2.0.0", + "nugetVersion": "2.0.0", + "nugetId": "Xamarin.Google.Android.Play.Feature.Delivery.Ktx", + "dependencyOnly": false + }, { "groupId": "com.google.android.play", "artifactId": "integrity", @@ -1986,6 +2066,14 @@ "nugetId": "Xamarin.Kotlin.StdLib.Common", "dependencyOnly": true }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib-jdk7", + "version": "1.6.21", + "nugetVersion": "1.6.21.1", + "nugetId": "Xamarin.Kotlin.StdLib.Jdk7", + "dependencyOnly": true + }, { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib-jdk8", @@ -1994,6 +2082,22 @@ "nugetId": "Xamarin.Kotlin.StdLib.Jdk8", "dependencyOnly": true }, + { + "groupId": "org.jetbrains.kotlinx", + "artifactId": "kotlinx-coroutines-android", + "version": "1.5.2", + "nugetVersion": "1.5.2.5", + "nugetId": "Xamarin.KotlinX.Coroutines.Android", + "dependencyOnly": true + }, + { + "groupId": "org.jetbrains.kotlinx", + "artifactId": "kotlinx-coroutines-core", + "version": "1.5.2", + "nugetVersion": "1.5.2.5", + "nugetId": "Xamarin.KotlinX.Coroutines.Core", + "dependencyOnly": true + }, { "groupId": "com.google.auto.value", "artifactId": "auto-value-annotations", diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index 309d5daba..434fecc54 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -72,7 +72,17 @@ + + + + + + + + + + @@ -239,7 +249,10 @@ + + + diff --git a/samples/NuGet.Config b/samples/NuGet.Config deleted file mode 100644 index f354137c9..000000000 --- a/samples/NuGet.Config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/NuGet.config b/samples/NuGet.config new file mode 100644 index 000000000..c9a7b8642 --- /dev/null +++ b/samples/NuGet.config @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/AdsLiteSample.csproj b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/AdsLiteSample.csproj index 2848ff126..34a22075f 100644 --- a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/AdsLiteSample.csproj +++ b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/AdsLiteSample.csproj @@ -112,21 +112,21 @@ - - - - - + + + + - 1.0.8 + 1.0.10 0.11.3 - 1.6.1 + 1.7.3 + 120.0.0 diff --git a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml index 23f236143..022714543 100644 --- a/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml +++ b/samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj b/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj index 074a79d8e..1f6b3b526 100644 --- a/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj +++ b/samples/com.google.android.gms/play-services-ads/AdMobSample/AdMobSample.csproj @@ -94,8 +94,8 @@ - - + + 0.11.3 diff --git a/samples/com.google.android.gms/play-services-ads/AdMobSample/Properties/AndroidManifest.xml b/samples/com.google.android.gms/play-services-ads/AdMobSample/Properties/AndroidManifest.xml index d792de286..a2ca9599c 100644 --- a/samples/com.google.android.gms/play-services-ads/AdMobSample/Properties/AndroidManifest.xml +++ b/samples/com.google.android.gms/play-services-ads/AdMobSample/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + diff --git a/source/com.google.android.play/app-update-ktx/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/app-update-ktx/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..353ba744d --- /dev/null +++ b/source/com.google.android.play/app-update-ktx/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,8 @@ + + + Xamarin.Google.Android.Play.Core.Ktx + + \ No newline at end of file diff --git a/source/com.google.android.play/app-update-ktx/Transforms/Metadata.xml b/source/com.google.android.play/app-update-ktx/Transforms/Metadata.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/com.google.android.play/app-update-ktx/Transforms/Metadata.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.play/app-update/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/app-update/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..9236be54d --- /dev/null +++ b/source/com.google.android.play/app-update/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,33 @@ + + + Xamarin.Google.Android.Play.Core.AppUpdate + + + Xamarin.Google.Android.Play.Core.AppUpdate.Internal + + + Xamarin.Google.Android.Play.Core.AppUpdate.Testing + + + Xamarin.Google.Android.Play.Core.AppUpdate.Install + + + Xamarin.Google.Android.Play.Core.AppUpdate.Install.Model + + + \ No newline at end of file diff --git a/source/com.google.android.play/app-update/Transforms/Metadata.xml b/source/com.google.android.play/app-update/Transforms/Metadata.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/com.google.android.play/app-update/Transforms/Metadata.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.play/asset-delivery-ktx/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/asset-delivery-ktx/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..aa29ba694 --- /dev/null +++ b/source/com.google.android.play/asset-delivery-ktx/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,8 @@ + + + Xamarin.Google.Android.Play.Core.Ktx + + \ No newline at end of file diff --git a/source/com.google.android.play/asset-delivery-ktx/Transforms/Metadata.xml b/source/com.google.android.play/asset-delivery-ktx/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.play/asset-delivery-ktx/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.play/asset-delivery/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/asset-delivery/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..4516a13b1 --- /dev/null +++ b/source/com.google.android.play/asset-delivery/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,21 @@ + + + Xamarin.Google.Android.Play.Core.AssetPacks + + + Xamarin.Google.Android.Play.Core.AssetPacks.Internal + + + Xamarin.Google.Android.Play.Core.AssetPacks.Model + + + \ No newline at end of file diff --git a/source/com.google.android.play/asset-delivery/Transforms/Metadata.xml b/source/com.google.android.play/asset-delivery/Transforms/Metadata.xml new file mode 100644 index 000000000..cf0eedfbe --- /dev/null +++ b/source/com.google.android.play/asset-delivery/Transforms/Metadata.xml @@ -0,0 +1,8 @@ + + + Java.Lang.Object + + \ No newline at end of file diff --git a/source/com.google.android.play/core-common/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/core-common/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..6fd4e5efa --- /dev/null +++ b/source/com.google.android.play/core-common/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,14 @@ + + + Xamarin.Google.Android.Play.Core.Common + + + Xamarin.Google.Android.Play.Core.Listener + + \ No newline at end of file diff --git a/source/com.google.android.play/core-common/Transforms/Metadata.xml b/source/com.google.android.play/core-common/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.play/core-common/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.play/core-ktx/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/core-ktx/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..aa29ba694 --- /dev/null +++ b/source/com.google.android.play/core-ktx/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,8 @@ + + + Xamarin.Google.Android.Play.Core.Ktx + + \ No newline at end of file diff --git a/source/com.google.android.play/core-ktx/Transforms/Metadata.xml b/source/com.google.android.play/core-ktx/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.play/core-ktx/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.play/core.extensions/extensions-aar/.project b/source/com.google.android.play/core.extensions/extensions-aar/.project index c654371b2..8541602b4 100644 --- a/source/com.google.android.play/core.extensions/extensions-aar/.project +++ b/source/com.google.android.play/core.extensions/extensions-aar/.project @@ -1,6 +1,6 @@ - playcorehelper + extensions-aar Project playcorehelper created by Buildship. @@ -22,7 +22,7 @@ - 1620209182910 + 0 30 diff --git a/source/com.google.android.play/core/Transforms/EnumFields.xml b/source/com.google.android.play/core/Transforms/EnumFields.xml deleted file mode 100644 index 68cc7fd68..000000000 --- a/source/com.google.android.play/core/Transforms/EnumFields.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/source/com.google.android.play/core/Transforms/EnumMethods.xml b/source/com.google.android.play/core/Transforms/EnumMethods.xml deleted file mode 100644 index bd77573ac..000000000 --- a/source/com.google.android.play/core/Transforms/EnumMethods.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/source/com.google.android.play/feature-delivery-ktx/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/feature-delivery-ktx/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..aa29ba694 --- /dev/null +++ b/source/com.google.android.play/feature-delivery-ktx/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,8 @@ + + + Xamarin.Google.Android.Play.Core.Ktx + + \ No newline at end of file diff --git a/source/com.google.android.play/feature-delivery-ktx/Transforms/Metadata.xml b/source/com.google.android.play/feature-delivery-ktx/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.play/feature-delivery-ktx/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.play/core/Additions/Additions.cs b/source/com.google.android.play/feature-delivery/Additions/Additions.cs similarity index 100% rename from source/com.google.android.play/core/Additions/Additions.cs rename to source/com.google.android.play/feature-delivery/Additions/Additions.cs diff --git a/source/com.google.android.play/feature-delivery/Transforms/EnumFields.xml b/source/com.google.android.play/feature-delivery/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/com.google.android.play/feature-delivery/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.play/feature-delivery/Transforms/EnumMethods.xml b/source/com.google.android.play/feature-delivery/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/com.google.android.play/feature-delivery/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.play/feature-delivery/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/feature-delivery/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..342c29025 --- /dev/null +++ b/source/com.google.android.play/feature-delivery/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,33 @@ + + + Xamarin.Google.Android.Play.Core.SplitCompat + + + Xamarin.Google.Android.Play.Core.SplitInstall + + + Xamarin.Google.Android.Play.Core.SplitInstall.Internal + + + Xamarin.Google.Android.Play.Core.SplitInstall.Model + + + Xamarin.Google.Android.Play.Core.SplitInstall.Testing + + + \ No newline at end of file diff --git a/source/com.google.android.play/feature-delivery/Transforms/Metadata.ParameterNames.xml b/source/com.google.android.play/feature-delivery/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/com.google.android.play/feature-delivery/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.play/feature-delivery/Transforms/Metadata.xml b/source/com.google.android.play/feature-delivery/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.play/feature-delivery/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.play/review-ktx/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/review-ktx/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..aa29ba694 --- /dev/null +++ b/source/com.google.android.play/review-ktx/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,8 @@ + + + Xamarin.Google.Android.Play.Core.Ktx + + \ No newline at end of file diff --git a/source/com.google.android.play/review-ktx/Transforms/Metadata.xml b/source/com.google.android.play/review-ktx/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.play/review-ktx/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/com.google.android.play/review/Transforms/Metadata.Namespaces.xml b/source/com.google.android.play/review/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..80fdb3096 --- /dev/null +++ b/source/com.google.android.play/review/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,26 @@ + + + Xamarin.Google.Android.Play.Core.Review + + + Xamarin.Google.Android.Play.Core.Review.Internal + + + Xamarin.Google.Android.Play.Core.Review.Model + + + Xamarin.Google.Android.Play.Core.Review.Testing + + \ No newline at end of file diff --git a/source/com.google.android.play/review/Transforms/Metadata.xml b/source/com.google.android.play/review/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.play/review/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file