diff --git a/Readme.md b/Readme.md index 404310421..c202ef8da 100644 --- a/Readme.md +++ b/Readme.md @@ -6,26 +6,26 @@ Xamarin creates and maintains Xamarin.iOS bindings for the Google APIs for iOS L | Package Id | NuGet | |------------------------------------------------------------------------------|-----------------------------------------------| -| [Xamarin.Firebase.iOS.ABTesting][F.ABTesting.Name] | [8.10.0][F.ABTesting.Package] | -| [Xamarin.Firebase.iOS.AdMob][F.AdMob.Name] | [8.10.0.0][F.AdMob.Package] | -| [Xamarin.Firebase.iOS.Analytics][F.Analytics.Name] | [8.10.0][F.Analytics.Package] | -| [Xamarin.Firebase.iOS.Auth][F.Auth.Name] | [8.10.0][F.Auth.Package] | -| [Xamarin.Firebase.iOS.CloudFirestore][F.CloudFirestore.Name] | [8.10.0][F.CloudFirestore.Package] | -| [Xamarin.Firebase.iOS.CloudFunctions][F.CloudFunctions.Name] | [8.10.0][F.CloudFunctions.Package] | -| [Xamarin.Firebase.iOS.CloudMessaging][F.CloudMessaging.Name] | [8.10.0][F.CloudMessaging.Package] | -| [Xamarin.Firebase.iOS.Core][F.Core.Name] | [8.10.0][F.Core.Package] | -| [Xamarin.Firebase.iOS.Crashlytics][F.Crashlytics.Name] | [8.10.0][F.Crashlytics.Package] | -| [Xamarin.Firebase.iOS.Database][F.Database.Name] | [8.10.0][F.Database.Package] | -| [Xamarin.Firebase.iOS.DynamicLinks][F.DynamicLinks.Name] | [8.10.0][F.DynamicLinks.Package] | -| [Xamarin.Firebase.iOS.InAppMessaging][F.InAppMessaging.Name] | [8.10.0][F.InAppMessaging.Package] | -| [Xamarin.Firebase.iOS.Installations][F.Installations.Name] | [8.10.0][F.Installations.Package] | -| [Xamarin.Firebase.iOS.PerformanceMonitoring][F.PerformanceMonitoring.Name] | [8.10.0][F.PerformanceMonitoring.Package] | -| [Xamarin.Firebase.iOS.RemoteConfig][F.RemoteConfig.Name] | [8.10.0][F.RemoteConfig.Package] | -| [Xamarin.Firebase.iOS.Storage][F.Storage.Name] | [8.10.0][F.Storage.Package] | +| [Xamarin.Firebase.iOS.ABTesting][F.ABTesting.Name] | [8.15.0][F.ABTesting.Package] | +| [Xamarin.Firebase.iOS.AdMob][F.AdMob.Name] | [8.15.0.0][F.AdMob.Package] | +| [Xamarin.Firebase.iOS.Analytics][F.Analytics.Name] | [8.15.0][F.Analytics.Package] | +| [Xamarin.Firebase.iOS.Auth][F.Auth.Name] | [8.15.0][F.Auth.Package] | +| [Xamarin.Firebase.iOS.CloudFirestore][F.CloudFirestore.Name] | [8.15.0][F.CloudFirestore.Package] | +| [Xamarin.Firebase.iOS.CloudFunctions][F.CloudFunctions.Name] | [8.15.0][F.CloudFunctions.Package] | +| [Xamarin.Firebase.iOS.CloudMessaging][F.CloudMessaging.Name] | [8.15.0][F.CloudMessaging.Package] | +| [Xamarin.Firebase.iOS.Core][F.Core.Name] | [8.15.0][F.Core.Package] | +| [Xamarin.Firebase.iOS.Crashlytics][F.Crashlytics.Name] | [8.15.0][F.Crashlytics.Package] | +| [Xamarin.Firebase.iOS.Database][F.Database.Name] | [8.15.0][F.Database.Package] | +| [Xamarin.Firebase.iOS.DynamicLinks][F.DynamicLinks.Name] | [8.15.0][F.DynamicLinks.Package] | +| [Xamarin.Firebase.iOS.InAppMessaging][F.InAppMessaging.Name] | [8.15.0][F.InAppMessaging.Package] | +| [Xamarin.Firebase.iOS.Installations][F.Installations.Name] | [8.15.0][F.Installations.Package] | +| [Xamarin.Firebase.iOS.PerformanceMonitoring][F.PerformanceMonitoring.Name] | [8.15.0][F.PerformanceMonitoring.Package] | +| [Xamarin.Firebase.iOS.RemoteConfig][F.RemoteConfig.Name] | [8.15.0][F.RemoteConfig.Package] | +| [Xamarin.Firebase.iOS.Storage][F.Storage.Name] | [8.15.0][F.Storage.Package] | | [Xamarin.Google.iOS.Analytics][G.Analytics.Name] | [3.20.0.0][G.Analytics.Package] | | [Xamarin.Google.iOS.Cast][G.Cast.Name] | [4.7.0.0][G.Cast.Package] | -| [Xamarin.Google.iOS.Maps][G.Maps.Name] | [6.0.1.0][G.Maps.Package] | -| [Xamarin.Google.iOS.MobileAds][G.MobileAds.Name] | [8.13.0.0][G.MobileAds.Package] | +| [Xamarin.Google.iOS.Maps][G.Maps.Name] | [6.1.1.0][G.Maps.Package] | +| [Xamarin.Google.iOS.MobileAds][G.MobileAds.Name] | [9.5.0.0][G.MobileAds.Package] | | [Xamarin.Google.iOS.UserMessagingPlatform][G.UserMessagingPlatform.Name] | [1.1.0.0][G.UserMessagingPlatform.Package] | | [Xamarin.Google.iOS.Places][G.Places.Name] | [6.0.0.0][G.Places.Package] | | [Xamarin.Google.iOS.SignIn][G.SignIn.Name] | [5.0.2.2][G.SignIn.Package] | @@ -56,26 +56,26 @@ Here's a table that shows in which global version is located each component of F | Component Name | Component Version | Global Version | |----------------------------------|:------------------:|:--------------:| -| Firebase A/B Testing | **8.10.0** | **8.10.0** | -| Firebase AdMob | **8.10.0** | **8.10.0** | -| Firebase Analytics | **8.10.0** | **8.10.0** | -| Firebase Auth | **8.10.0** | **8.10.0** | -| Firebase Cloud Firestore | **8.10.0** | **8.10.0** | -| Firebase Cloud Functions | **8.10.0** | **8.10.0** | -| Firebase Cloud Messaging | **8.10.0** | **8.10.0** | -| Firebase Core | **8.10.0** | **8.10.0** | -| Firebase Crashlytics | **8.10.0** | **8.10.0** | -| Firebase Database | **8.10.0** | **8.10.0** | -| Firebase Dynamic Links | **8.10.0** | **8.10.0** | -| Firebase In App Messaging | **8.10.0** | **8.10.0** | -| Firebase Installations | **8.10.0** | **8.10.0** | -| Firebase Performance Monitoring | **8.10.0** | **8.10.0** | -| Firebase RemoteConfig | **8.10.0** | **8.10.0** | -| Firebase Storage | **8.10.0** | **8.10.0** | -| Google User Messaging Platform | **1.1.0.0** | **8.10.0** | -| Google Cast | **4.7.0.0** | **8.10.0** | -| Google Sign-In | **5.0.2.2** | **8.10.0** | -| Google Tag Manager | **7.4.0.0** | **8.10.0** | +| Firebase A/B Testing | **8.15.0** | **8.15.0** | +| Firebase AdMob | **8.15.0** | **8.15.0** | +| Firebase Analytics | **8.15.0** | **8.15.0** | +| Firebase Auth | **8.15.0** | **8.15.0** | +| Firebase Cloud Firestore | **8.15.0** | **8.15.0** | +| Firebase Cloud Functions | **8.15.0** | **8.15.0** | +| Firebase Cloud Messaging | **8.15.0** | **8.15.0** | +| Firebase Core | **8.15.0** | **8.15.0** | +| Firebase Crashlytics | **8.15.0** | **8.15.0** | +| Firebase Database | **8.15.0** | **8.15.0** | +| Firebase Dynamic Links | **8.15.0** | **8.15.0** | +| Firebase In App Messaging | **8.15.0** | **8.15.0** | +| Firebase Installations | **8.15.0** | **8.15.0** | +| Firebase Performance Monitoring | **8.15.0** | **8.15.0** | +| Firebase RemoteConfig | **8.15.0** | **8.15.0** | +| Firebase Storage | **8.15.0** | **8.15.0** | +| Google User Messaging Platform | **1.1.0.0** | **8.15.0** | +| Google Cast | **4.7.0.0** | **8.15.0** | +| Google Sign-In | **5.0.2.2** | **8.15.0** | +| Google Tag Manager | **7.4.0.0** | **8.15.0** | ## Ad Id Support diff --git a/cgmanifest.json b/cgmanifest.json index b16b00c74..ca8b04ac4 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5,7 +5,7 @@ "Type": "Pod", "Pod": { "Name": "abseil", - "Version": "0.20200225.0" + "Version": "1.20211102.0" } } }, @@ -23,7 +23,16 @@ "type": "Pod", "Pod": { "name": "BoringSSL-GRPC", - "Version": "0.0.7" + "Version": "0.0.24" + } + } + }, + { + "component": { + "type": "Pod", + "Pod": { + "name": "Libuv-gRPC", + "Version": "0.0.10" } } }, @@ -32,7 +41,7 @@ "type": "Pod", "Pod": { "name": "FirebaseABTesting", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -41,7 +50,7 @@ "type": "Pod", "Pod": { "name": "FirebaseAnalytics", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -50,7 +59,7 @@ "type": "Pod", "Pod": { "name": "FirebaseAuth", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -59,7 +68,7 @@ "type": "Pod", "Pod": { "name": "FirebaseCore", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -68,7 +77,7 @@ "type": "Pod", "Pod": { "name": "FirebaseCoreDiagnostics", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -77,7 +86,7 @@ "type": "Pod", "Pod": { "name": "FirebaseCrashlytics", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -86,7 +95,7 @@ "type": "Pod", "Pod": { "name": "FirebaseDatabase", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -95,7 +104,7 @@ "type": "Pod", "Pod": { "name": "FirebaseDynamicLinks", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -104,7 +113,7 @@ "type": "Pod", "Pod": { "name": "FirebaseFirestore", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -113,7 +122,7 @@ "type": "Pod", "Pod": { "name": "FirebaseFunctions", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -122,7 +131,7 @@ "type": "Pod", "Pod": { "name": "FirebaseInAppMessaging", - "Version": "8.10.0-beta" + "Version": "8.13.0-beta" } } }, @@ -131,7 +140,7 @@ "type": "Pod", "Pod": { "name": "FirebaseInstallations", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -140,7 +149,7 @@ "type": "Pod", "Pod": { "name": "FirebaseMessaging", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -149,7 +158,7 @@ "type": "Pod", "Pod": { "name": "FirebasePerformance", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -158,7 +167,7 @@ "type": "Pod", "Pod": { "name": "FirebaseRemoteConfig", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -167,7 +176,7 @@ "type": "Pod", "Pod": { "name": "FirebaseStorage", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -176,7 +185,7 @@ "type": "Pod", "Pod": { "name": "FirebaseAppDistribution", - "Version": "8.10.0-beta" + "Version": "8.13.0-beta" } } }, @@ -185,7 +194,7 @@ "type": "Pod", "Pod": { "name": "FirebaseAppCheck", - "Version": "8.10.0-beta" + "Version": "8.13.0-beta" } } }, @@ -203,7 +212,7 @@ "type": "Pod", "Pod": { "name": "GoogleAppMeasurement", - "Version": "8.10.0" + "Version": "8.15.0" } } }, @@ -248,7 +257,7 @@ "type": "Pod", "Pod": { "name": "GoogleMaps", - "Version": "6.0.1" + "Version": "6.1.1" } } }, @@ -257,7 +266,7 @@ "type": "Pod", "Pod": { "name": "Google-Mobile-Ads-SDK", - "Version": "8.13.0" + "Version": "9.5.0" } } }, @@ -311,7 +320,7 @@ "type": "Pod", "Pod": { "name": "GoogleUtilities", - "Version": "7.6.0" + "Version": "7.7.0" } } }, @@ -329,7 +338,7 @@ "type": "Pod", "Pod": { "name": "gRPC-C++", - "Version": "1.28.2" + "Version": "1.44.0" } } }, @@ -338,7 +347,7 @@ "type": "Pod", "Pod": { "name": "gRPC-Core", - "Version": "1.28.2" + "Version": "1.44.0" } } }, @@ -518,7 +527,7 @@ "type": "Pod", "Pod": { "name": "MLKitBarcodeScanning", - "Version": "1.6.0" + "Version": "1.7.0" } } }, diff --git a/components.cake b/components.cake index 213608508..1e5143637 100644 --- a/components.cake +++ b/components.cake @@ -1,28 +1,28 @@ // Firebase artifacts available to be built. These artifacts generate NuGets. -Artifact FIREBASE_AB_TESTING_ARTIFACT = new Artifact ("Firebase.ABTesting", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "ABTesting"); -Artifact FIREBASE_AD_MOB_ARTIFACT = new Artifact ("Firebase.AdMob", "8.13.0", "10.0", ComponentGroup.Firebase, csprojName: "AdMob"); -Artifact FIREBASE_ANALYTICS_ARTIFACT = new Artifact ("Firebase.Analytics", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "Analytics"); -Artifact FIREBASE_AUTH_ARTIFACT = new Artifact ("Firebase.Auth", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "Auth"); -Artifact FIREBASE_CLOUD_FIRESTORE_ARTIFACT = new Artifact ("Firebase.CloudFirestore", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "CloudFirestore"); -Artifact FIREBASE_CLOUD_FUNCTIONS_ARTIFACT = new Artifact ("Firebase.CloudFunctions", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "CloudFunctions"); -Artifact FIREBASE_CLOUD_MESSAGING_ARTIFACT = new Artifact ("Firebase.CloudMessaging", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "CloudMessaging"); -Artifact FIREBASE_CORE_ARTIFACT = new Artifact ("Firebase.Core", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "Core"); -Artifact FIREBASE_CRASHLYTICS_ARTIFACT = new Artifact ("Firebase.Crashlytics", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "Crashlytics"); -Artifact FIREBASE_DATABASE_ARTIFACT = new Artifact ("Firebase.Database", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "Database"); -Artifact FIREBASE_DYNAMIC_LINKS_ARTIFACT = new Artifact ("Firebase.DynamicLinks", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "DynamicLinks"); -Artifact FIREBASE_IN_APP_MESSAGING_ARTIFACT = new Artifact ("Firebase.InAppMessaging", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "InAppMessaging"); -Artifact FIREBASE_INSTALLATIONS_ARTIFACT = new Artifact ("Firebase.Installations", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "Installations"); -Artifact FIREBASE_PERFORMANCE_MONITORING_ARTIFACT = new Artifact ("Firebase.PerformanceMonitoring", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "PerformanceMonitoring"); -Artifact FIREBASE_REMOTE_CONFIG_ARTIFACT = new Artifact ("Firebase.RemoteConfig", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "RemoteConfig"); -Artifact FIREBASE_STORAGE_ARTIFACT = new Artifact ("Firebase.Storage", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "Storage"); -// Artifact FIREBASE_APP_DISTRIBUTION_ARTIFACT = new Artifact ("Firebase.AppDistribution", "8.10.0", "10.0", ComponentGroup.Firebase, csprojName: "AppDistribution"); -// Artifact FIREBASE_APP_CHECK_ARTIFACT = new Artifact ("Firebase.AppCheck", "8.10.0", "11.0", ComponentGroup.Firebase, csprojName: "AppCheck"); +Artifact FIREBASE_AB_TESTING_ARTIFACT = new Artifact ("Firebase.ABTesting", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "ABTesting"); +Artifact FIREBASE_AD_MOB_ARTIFACT = new Artifact ("Firebase.AdMob", "9.4.0", "10.0", ComponentGroup.Firebase, csprojName: "AdMob"); +Artifact FIREBASE_ANALYTICS_ARTIFACT = new Artifact ("Firebase.Analytics", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "Analytics"); +Artifact FIREBASE_AUTH_ARTIFACT = new Artifact ("Firebase.Auth", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "Auth"); +Artifact FIREBASE_CLOUD_FIRESTORE_ARTIFACT = new Artifact ("Firebase.CloudFirestore", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "CloudFirestore"); +Artifact FIREBASE_CLOUD_FUNCTIONS_ARTIFACT = new Artifact ("Firebase.CloudFunctions", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "CloudFunctions"); +Artifact FIREBASE_CLOUD_MESSAGING_ARTIFACT = new Artifact ("Firebase.CloudMessaging", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "CloudMessaging"); +Artifact FIREBASE_CORE_ARTIFACT = new Artifact ("Firebase.Core", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "Core"); +Artifact FIREBASE_CRASHLYTICS_ARTIFACT = new Artifact ("Firebase.Crashlytics", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "Crashlytics"); +Artifact FIREBASE_DATABASE_ARTIFACT = new Artifact ("Firebase.Database", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "Database"); +Artifact FIREBASE_DYNAMIC_LINKS_ARTIFACT = new Artifact ("Firebase.DynamicLinks", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "DynamicLinks"); +Artifact FIREBASE_IN_APP_MESSAGING_ARTIFACT = new Artifact ("Firebase.InAppMessaging", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "InAppMessaging"); +Artifact FIREBASE_INSTALLATIONS_ARTIFACT = new Artifact ("Firebase.Installations", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "Installations"); +Artifact FIREBASE_PERFORMANCE_MONITORING_ARTIFACT = new Artifact ("Firebase.PerformanceMonitoring", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "PerformanceMonitoring"); +Artifact FIREBASE_REMOTE_CONFIG_ARTIFACT = new Artifact ("Firebase.RemoteConfig", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "RemoteConfig"); +Artifact FIREBASE_STORAGE_ARTIFACT = new Artifact ("Firebase.Storage", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "Storage"); +// Artifact FIREBASE_APP_DISTRIBUTION_ARTIFACT = new Artifact ("Firebase.AppDistribution", "8.15.0", "10.0", ComponentGroup.Firebase, csprojName: "AppDistribution"); +// Artifact FIREBASE_APP_CHECK_ARTIFACT = new Artifact ("Firebase.AppCheck", "8.15.0", "11.0", ComponentGroup.Firebase, csprojName: "AppCheck"); // Google artifacts available to be built. These artifacts generate NuGets. Artifact GOOGLE_ANALYTICS_ARTIFACT = new Artifact ("Google.Analytics", "3.20.0.0", "9.0", ComponentGroup.Google, csprojName: "Analytics"); Artifact GOOGLE_CAST_ARTIFACT = new Artifact ("Google.Cast", "4.7.0.0", "12.0", ComponentGroup.Google, csprojName: "Cast"); -Artifact GOOGLE_MAPS_ARTIFACT = new Artifact ("Google.Maps", "6.0.1.0", "12.0", ComponentGroup.Google, csprojName: "Maps"); -Artifact GOOGLE_MOBILE_ADS_ARTIFACT = new Artifact ("Google.MobileAds", "8.13.0.0", "10.0", ComponentGroup.Google, csprojName: "MobileAds"); +Artifact GOOGLE_MAPS_ARTIFACT = new Artifact ("Google.Maps", "6.1.1.0", "12.0", ComponentGroup.Google, csprojName: "Maps"); +Artifact GOOGLE_MOBILE_ADS_ARTIFACT = new Artifact ("Google.MobileAds", "9.5.0.0", "11.0", ComponentGroup.Google, csprojName: "MobileAds"); Artifact GOOGLE_UMP_ARTIFACT = new Artifact ("Google.UserMessagingPlatform", "1.1.0.0", "10.0", ComponentGroup.Google, csprojName: "UserMessagingPlatform"); Artifact GOOGLE_PLACES_ARTIFACT = new Artifact ("Google.Places", "6.0.0.0", "12.0", ComponentGroup.Google, csprojName: "Places"); Artifact GOOGLE_SIGN_IN_ARTIFACT = new Artifact ("Google.SignIn", "5.0.2.2", "10.0", ComponentGroup.Google, csprojName: "SignIn"); @@ -38,7 +38,7 @@ Artifact MLKIT_TEXT_RECOGNITION_DEVANAGARI = new Artifact ("MLKit.TextReco Artifact MLKIT_TEXT_RECOGNITION_JAPANESE = new Artifact ("MLKit.TextRecognition.Japanese", "1.0.0.3", "10.0", ComponentGroup.MLKit, csprojName: "TextRecognitionJapanese"); Artifact MLKIT_TEXT_RECOGNITION_KOREAN = new Artifact ("MLKit.TextRecognition.Korean", "1.0.0.3", "10.0", ComponentGroup.MLKit, csprojName: "TextRecognitionKorean"); Artifact MLKIT_FACE_DETECTION = new Artifact ("MLKit.FaceDetection", "1.5.0", "10.0", ComponentGroup.MLKit, csprojName: "FaceDetection"); -Artifact MLKIT_BARCODE_SCANNING = new Artifact ("MLKit.BarcodeScanning", "1.6.0", "10.0", ComponentGroup.MLKit, csprojName: "BarcodeScanning"); +Artifact MLKIT_BARCODE_SCANNING = new Artifact ("MLKit.BarcodeScanning", "1.7.0", "10.0", ComponentGroup.MLKit, csprojName: "BarcodeScanning"); Artifact MLKIT_DIGITAL_INK_RECOGNITION = new Artifact ("MLKit.DigitalInkRecognition", "1.5.0", "10.0", ComponentGroup.MLKit, csprojName: "DigitalInkRecognition"); Artifact MLKIT_IMAGE_LABELING = new Artifact ("MLKit.ImageLabeling", "1.5.0", "10.0", ComponentGroup.MLKit, csprojName: "ImageLabeling"); Artifact MLKIT_OBJECT_DETECTION = new Artifact ("MLKit.ObjectDetection", "1.5.0", "10.0", ComponentGroup.MLKit, csprojName: "ObjectDetection"); @@ -136,74 +136,75 @@ void SetArtifactsPodSpecs () { // Firebase components FIREBASE_AB_TESTING_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseABTesting", targetName: "FirebaseABTesting", subSpecs: new [] { "ABTesting" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseABTesting", targetName: "FirebaseABTesting", subSpecs: new [] { "ABTesting" }) }; FIREBASE_AD_MOB_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", subSpecs: new [] { "AdMob" }) + PodSpec.Create ("Firebase", "8.15.0", subSpecs: new [] { "AdMob" }) }; FIREBASE_ANALYTICS_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", subSpecs: new [] { "Analytics" }) + PodSpec.Create ("Firebase", "8.15.0", subSpecs: new [] { "Analytics" }) }; FIREBASE_AUTH_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseAuth", targetName: "FirebaseAuth", subSpecs: new [] { "Auth" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseAuth", targetName: "FirebaseAuth", subSpecs: new [] { "Auth" }) }; FIREBASE_CLOUD_FIRESTORE_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseFirestore", targetName: "FirebaseFirestore", subSpecs: new [] { "Firestore" }), - PodSpec.Create ("BoringSSL-GRPC", "0.0.7", frameworkSource: FrameworkSource.Pods, frameworkName: "openssl_grpc"), - PodSpec.Create ("gRPC-Core", "1.28.2", frameworkSource: FrameworkSource.Pods, frameworkName: "grpc"), - PodSpec.Create ("gRPC-C++", "1.28.2", frameworkSource: FrameworkSource.Pods, frameworkName: "grpcpp"), - PodSpec.Create ("abseil", "0.20200225.0", frameworkSource: FrameworkSource.Pods, frameworkName: "absl", subSpecs: new [] { "algorithm", "base", "memory", "meta", "strings", "time", "types" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseFirestore", targetName: "FirebaseFirestore", subSpecs: new [] { "Firestore" }), + PodSpec.Create ("BoringSSL-GRPC", "0.0.24", frameworkSource: FrameworkSource.Pods, frameworkName: "openssl_grpc"), + PodSpec.Create ("Libuv-gRPC", "0.0.10", frameworkSource: FrameworkSource.Pods, frameworkName: "uv"), + PodSpec.Create ("gRPC-Core", "1.44.0", frameworkSource: FrameworkSource.Pods, frameworkName: "grpc"), + PodSpec.Create ("gRPC-C++", "1.44.0", frameworkSource: FrameworkSource.Pods, frameworkName: "grpcpp"), + PodSpec.Create ("abseil", "1.20211102.0", frameworkSource: FrameworkSource.Pods, frameworkName: "absl", subSpecs: new [] { "algorithm", "base", "memory", "meta", "strings", "time", "types" }) }; FIREBASE_CLOUD_FUNCTIONS_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseFunctions", targetName: "FirebaseFunctions", subSpecs: new [] { "Functions" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseFunctions", targetName: "FirebaseFunctions", subSpecs: new [] { "Functions" }) }; FIREBASE_CLOUD_MESSAGING_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseMessaging", targetName: "FirebaseMessaging", subSpecs: new [] { "Messaging" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseMessaging", targetName: "FirebaseMessaging", subSpecs: new [] { "Messaging" }) }; FIREBASE_CORE_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseCore", targetName: "FirebaseCore", subSpecs: new [] { "CoreOnly" }), - PodSpec.Create ("FirebaseCoreDiagnostics", "8.10.0", frameworkSource: FrameworkSource.Pods), + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseCore", targetName: "FirebaseCore", subSpecs: new [] { "CoreOnly" }), + PodSpec.Create ("FirebaseCoreDiagnostics", "8.15.0", frameworkSource: FrameworkSource.Pods), PodSpec.Create ("GTMSessionFetcher", "1.7.0", frameworkSource: FrameworkSource.Pods, subSpecs: new [] { "Full" }), PodSpec.Create ("GoogleAPIClientForREST", "1.6.0", frameworkSource: FrameworkSource.Pods, subSpecs: new [] { "Vision" }, useDefaultSubspecs: true), - PodSpec.Create ("GoogleAppMeasurement", "8.10.0"), + PodSpec.Create ("GoogleAppMeasurement", "8.9.1"), PodSpec.Create ("GoogleDataTransport", "9.1.2", frameworkSource: FrameworkSource.Pods), PodSpec.Create ("PromisesObjC", "2.0.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FBLPromises", targetName: "PromisesObjC"), PodSpec.Create ("GoogleToolboxForMac", "2.3.2", frameworkSource: FrameworkSource.Pods, subSpecs: new [] { "NSData+zlib", "NSDictionary+URLArguments", "Logger", "StringEncoding", "URLBuilder" }), - PodSpec.Create ("GoogleUtilities", "7.6.0", frameworkSource: FrameworkSource.Pods, subSpecs: new [] { "AppDelegateSwizzler", "Environment", "Logger", "ISASwizzler", "MethodSwizzler", "Network", "NSData+zlib", "Reachability", "UserDefaults", }), + PodSpec.Create ("GoogleUtilities", "7.7.0", frameworkSource: FrameworkSource.Pods, subSpecs: new [] { "AppDelegateSwizzler", "Environment", "Logger", "ISASwizzler", "MethodSwizzler", "Network", "NSData+zlib", "Reachability", "UserDefaults", }), PodSpec.Create ("GoogleUtilitiesComponents", "1.0.0", frameworkSource: FrameworkSource.Pods), PodSpec.Create ("nanopb", "2.30908.0", frameworkSource: FrameworkSource.Pods), PodSpec.Create ("leveldb-library", "1.22.1", frameworkSource: FrameworkSource.Pods, frameworkName: "leveldb"), PodSpec.Create ("Protobuf", "3.15.8", frameworkSource: FrameworkSource.Pods, frameworkName: "Protobuf") }; FIREBASE_CRASHLYTICS_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseCrashlytics", targetName: "FirebaseCrashlytics", subSpecs: new [] { "Crashlytics" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseCrashlytics", targetName: "FirebaseCrashlytics", subSpecs: new [] { "Crashlytics" }) }; FIREBASE_DATABASE_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseDatabase", targetName: "FirebaseDatabase", subSpecs: new [] { "Database" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseDatabase", targetName: "FirebaseDatabase", subSpecs: new [] { "Database" }) }; FIREBASE_DYNAMIC_LINKS_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseDynamicLinks", targetName: "FirebaseDynamicLinks", subSpecs: new [] { "DynamicLinks" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseDynamicLinks", targetName: "FirebaseDynamicLinks", subSpecs: new [] { "DynamicLinks" }) }; FIREBASE_IN_APP_MESSAGING_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseInAppMessaging", targetName: "FirebaseInAppMessaging", subSpecs: new [] { "InAppMessaging" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseInAppMessaging", targetName: "FirebaseInAppMessaging", subSpecs: new [] { "InAppMessaging" }) }; FIREBASE_INSTALLATIONS_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("FirebaseInstallations", "8.10.0", frameworkSource: FrameworkSource.Pods) + PodSpec.Create ("FirebaseInstallations", "8.15.0", frameworkSource: FrameworkSource.Pods) }; FIREBASE_PERFORMANCE_MONITORING_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebasePerformance", targetName: "FirebasePerformance", subSpecs: new [] { "Performance" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebasePerformance", targetName: "FirebasePerformance", subSpecs: new [] { "Performance" }) }; FIREBASE_REMOTE_CONFIG_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseRemoteConfig", targetName: "FirebaseRemoteConfig", subSpecs: new [] { "RemoteConfig" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseRemoteConfig", targetName: "FirebaseRemoteConfig", subSpecs: new [] { "RemoteConfig" }) }; FIREBASE_STORAGE_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseStorage", targetName: "FirebaseStorage", subSpecs: new [] { "Storage" }) + PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseStorage", targetName: "FirebaseStorage", subSpecs: new [] { "Storage" }) }; // FIREBASE_APP_DISTRIBUTION_ARTIFACT.PodSpecs = new [] { - // PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseAppDistribution", targetName: "FirebaseAppDistribution", subSpecs: new [] { "AppDistribution" }) + // PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseAppDistribution", targetName: "FirebaseAppDistribution", subSpecs: new [] { "AppDistribution" }) // }; // FIREBASE_APP_CHECK_ARTIFACT.PodSpecs = new [] { - // PodSpec.Create ("Firebase", "8.10.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseAppCheck", targetName: "FirebaseAppCheck", subSpecs: new [] { "AppCheck" }) + // PodSpec.Create ("Firebase", "8.15.0", frameworkSource: FrameworkSource.Pods, frameworkName: "FirebaseAppCheck", targetName: "FirebaseAppCheck", subSpecs: new [] { "AppCheck" }) // }; // Google components @@ -214,10 +215,10 @@ void SetArtifactsPodSpecs () PodSpec.Create ("google-cast-sdk", "4.7.0") }; GOOGLE_MAPS_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("GoogleMaps", "6.0.1") + PodSpec.Create ("GoogleMaps", "6.1.1") }; GOOGLE_MOBILE_ADS_ARTIFACT.PodSpecs = new [] { - PodSpec.Create ("Google-Mobile-Ads-SDK", "8.13.0") + PodSpec.Create ("Google-Mobile-Ads-SDK", "8.15.0") }; GOOGLE_UMP_ARTIFACT.PodSpecs = new [] { PodSpec.Create ("GoogleUserMessagingPlatform", "1.1.0") diff --git a/source/Firebase/ABTesting/ABTesting.csproj b/source/Firebase/ABTesting/ABTesting.csproj index 933ec5eb1..5bf486f6e 100644 --- a/source/Firebase/ABTesting/ABTesting.csproj +++ b/source/Firebase/ABTesting/ABTesting.csproj @@ -6,7 +6,7 @@ Firebase.ABTesting Firebase.ABTesting 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=2004275 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/AdMob/AdMob.csproj b/source/Firebase/AdMob/AdMob.csproj index 4596cf9dd..74c37a8a1 100644 --- a/source/Firebase/AdMob/AdMob.csproj +++ b/source/Firebase/AdMob/AdMob.csproj @@ -6,7 +6,7 @@ Firebase.AdMob Firebase.AdMob 1.0.0.0 - 8.13.0 + 9.4.0 Resources true false @@ -24,7 +24,7 @@ https://go.microsoft.com/fwlink/?linkid=865546 License.md true - 8.13.0 + 9.4.0 diff --git a/source/Firebase/Analytics/Analytics.csproj b/source/Firebase/Analytics/Analytics.csproj index 3370eddd5..700f7a895 100644 --- a/source/Firebase/Analytics/Analytics.csproj +++ b/source/Firebase/Analytics/Analytics.csproj @@ -6,7 +6,7 @@ Firebase.Analytics Firebase.Analytics 1.0.0.0 - 8.10.0 + 8.15.0 Resources true true @@ -24,7 +24,7 @@ https://go.microsoft.com/fwlink/?linkid=865559 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/Analytics/Analytics.targets b/source/Firebase/Analytics/Analytics.targets index ea08da4a9..b25a8f341 100644 --- a/source/Firebase/Analytics/Analytics.targets +++ b/source/Firebase/Analytics/Analytics.targets @@ -3,20 +3,20 @@ <_FirebaseAnalyticsAssemblyName>Firebase.Analytics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - <_FirebaseAnalyticsItemsFolder>FAnlytcs-8.9.1 - <_FirebaseAnalyticsSDKBaseFolder>$(XamarinBuildDownloadDir)$(_FirebaseAnalyticsItemsFolder)\FirebaseAnalytics-8.9.1\Frameworks\ + <_FirebaseAnalyticsItemsFolder>FAnlytcs-8.15.0 + <_FirebaseAnalyticsSDKBaseFolder>$(XamarinBuildDownloadDir)$(_FirebaseAnalyticsItemsFolder)\FirebaseAnalytics-8.15.0\Frameworks\ - https://dl.google.com/firebase/ios/analytics/66ce3623aa8037ff/FirebaseAnalytics-8.9.1.tar.gz + https://dl.google.com/firebase/ios/analytics/dcdcf15b4c4831d9/FirebaseAnalytics-8.15.0.tar.gz Tgz - + Framework True diff --git a/source/Firebase/Analytics/Extension.cs b/source/Firebase/Analytics/Extension.cs index fe6447543..a2f5026f7 100644 --- a/source/Firebase/Analytics/Extension.cs +++ b/source/Firebase/Analytics/Extension.cs @@ -91,7 +91,7 @@ public static class ParameterNamesConstants public static NSString Quantity { get; } = new NSString ("quantity"); public static NSString Score { get; } = new NSString ("score"); public static NSString ScreenClass { get; } = new NSString ("screen_class"); - public static NSString ScreenName { get; } = new NSString ("score_name"); + public static NSString ScreenName { get; } = new NSString ("screen_name"); public static NSString SearchTerm { get; } = new NSString ("search_term"); public static NSString Shipping { get; } = new NSString ("shipping"); [Obsolete ("Use Method property instead.")] diff --git a/source/Firebase/AppCheck/AppCheck.csproj b/source/Firebase/AppCheck/AppCheck.csproj index 5cb9f866d..9b73ce342 100644 --- a/source/Firebase/AppCheck/AppCheck.csproj +++ b/source/Firebase/AppCheck/AppCheck.csproj @@ -6,7 +6,7 @@ Firebase.AppCheck Firebase.AppCheck 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865559 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/AppDistribution/AppDistribution.csproj b/source/Firebase/AppDistribution/AppDistribution.csproj index 7c4b0fa3e..1c2095a64 100644 --- a/source/Firebase/AppDistribution/AppDistribution.csproj +++ b/source/Firebase/AppDistribution/AppDistribution.csproj @@ -6,7 +6,7 @@ Firebase.AppDistribution Firebase.AppDistribution 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865559 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/Auth/Auth.csproj b/source/Firebase/Auth/Auth.csproj index 16566513e..7018cfab6 100644 --- a/source/Firebase/Auth/Auth.csproj +++ b/source/Firebase/Auth/Auth.csproj @@ -6,7 +6,7 @@ Firebase.Auth Firebase.Auth 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865530 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/CloudFirestore/CloudFirestore.csproj b/source/Firebase/CloudFirestore/CloudFirestore.csproj index 246fe4d4d..b67c668e4 100644 --- a/source/Firebase/CloudFirestore/CloudFirestore.csproj +++ b/source/Firebase/CloudFirestore/CloudFirestore.csproj @@ -6,7 +6,7 @@ Firebase.CloudFirestore Firebase.CloudFirestore 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=2030883 License.md true - 8.10.0 + 8.15.0 @@ -47,6 +47,9 @@ openssl_grpc.framework + + uv.framework + absl.framework diff --git a/source/Firebase/CloudFunctions/CloudFunctions.csproj b/source/Firebase/CloudFunctions/CloudFunctions.csproj index a3c629c66..e0c740fa4 100644 --- a/source/Firebase/CloudFunctions/CloudFunctions.csproj +++ b/source/Firebase/CloudFunctions/CloudFunctions.csproj @@ -6,7 +6,7 @@ Firebase.CloudFunctions Firebase.CloudFunctions 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=2125916 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/CloudMessaging/ApiDefinition.cs b/source/Firebase/CloudMessaging/ApiDefinition.cs index 0fd944695..3c7934beb 100644 --- a/source/Firebase/CloudMessaging/ApiDefinition.cs +++ b/source/Firebase/CloudMessaging/ApiDefinition.cs @@ -84,7 +84,7 @@ interface Messaging // -(void)tokenWithCompletion:(void (^ _Nonnull)(NSString * _Nullable, NSError * _Nullable))completion; [Export ("tokenWithCompletion:")] [Async] - void FetchToken (MessagingDeleteFcmTokenCompletionHandler completion); + void FetchToken (MessagingFcmTokenFetchCompletionHandler completion); // -(void)deleteTokenWithCompletion:(void (^ _Nonnull)(NSError * _Nullable))completion; [Export ("deleteTokenWithCompletion:")] diff --git a/source/Firebase/CloudMessaging/CloudMessaging.csproj b/source/Firebase/CloudMessaging/CloudMessaging.csproj index 7bf5319db..443a19ace 100644 --- a/source/Firebase/CloudMessaging/CloudMessaging.csproj +++ b/source/Firebase/CloudMessaging/CloudMessaging.csproj @@ -6,7 +6,7 @@ Firebase.CloudMessaging Firebase.CloudMessaging 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865576 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/Core/Core.csproj b/source/Firebase/Core/Core.csproj index d2ab2c404..3b33f682b 100644 --- a/source/Firebase/Core/Core.csproj +++ b/source/Firebase/Core/Core.csproj @@ -6,7 +6,7 @@ Firebase.Core Firebase.Core 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=2007321 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/Core/Core.targets b/source/Firebase/Core/Core.targets index 68cf9946f..0a40ad63a 100644 --- a/source/Firebase/Core/Core.targets +++ b/source/Firebase/Core/Core.targets @@ -1,23 +1,21 @@ - + - <_FirebaseCoreAssemblyName>Firebase.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - <_GoogleAppMeasurementItemsFolder>GAppM-8.9.1 - <_GoogleAppMeasurementSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleAppMeasurementItemsFolder)\GoogleAppMeasurement-8.9.1\Frameworks\ + <_GoogleAppMeasurementItemsFolder>GAppM-8.15.0 + <_GoogleAppMeasurementSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleAppMeasurementItemsFolder)\GoogleAppMeasurement-8.15.0\Frameworks\ - - https://dl.google.com/firebase/ios/analytics/59128155f949f77d/GoogleAppMeasurement-8.9.1.tar.gz + https://dl.google.com/firebase/ios/analytics/07f1277f1f905d64/GoogleAppMeasurement-8.15.0.tar.gz Tgz - - + + Framework True True @@ -25,9 +23,9 @@ StoreKit - - - + + + Framework True True @@ -36,4 +34,4 @@ - + \ No newline at end of file diff --git a/source/Firebase/Crashlytics/ApiDefinition.cs b/source/Firebase/Crashlytics/ApiDefinition.cs index 7ea3b9c2f..a12babb43 100644 --- a/source/Firebase/Crashlytics/ApiDefinition.cs +++ b/source/Firebase/Crashlytics/ApiDefinition.cs @@ -23,7 +23,7 @@ interface Crashlytics [Export ("log:")] void Log (string message); - // -(void)setCustomValue:(id _Nonnull)value forKey:(NSString * _Nonnull)key; + // - (void)setCustomValue:(nullable id)value forKey:(NSString *)key; [Export ("setCustomValue:forKey:")] void SetCustomValue (NSObject value, string key); @@ -31,7 +31,7 @@ interface Crashlytics [Export ("setCustomKeysAndValues:")] void SetCustomKeysAndValues (NSDictionary keysAndValues); - // -(void)setUserID:(NSString * _Nonnull)userID; + // -(void)setUserID:(nullable NSString *)userID; [Export ("setUserID:")] void SetUserId (string userId); @@ -131,7 +131,7 @@ interface CrashlyticsReport { [Export ("log:")] void Log (string msg); - // -(void)setCustomValue:(id _Nonnull)value forKey:(NSString * _Nonnull)key; + // -(void)setCustomValue:(nullable id)value forKey:(NSString *)key; [Export ("setCustomValue:forKey:")] void SetCustomValue (NSObject value, string key); @@ -139,7 +139,7 @@ interface CrashlyticsReport { [Export ("setCustomKeysAndValues:")] void SetCustomKeysAndValues (NSDictionary keysAndValues); - // -(void)setUserID:(NSString * _Nonnull)userID; + // -(void)setUserID:(nullable NSString *)userID; [Export ("setUserID:")] void SetUserID (string userID); } diff --git a/source/Firebase/Crashlytics/Crashlytics.csproj b/source/Firebase/Crashlytics/Crashlytics.csproj index dc7c01ad6..5eda568c1 100644 --- a/source/Firebase/Crashlytics/Crashlytics.csproj +++ b/source/Firebase/Crashlytics/Crashlytics.csproj @@ -6,7 +6,7 @@ Firebase.Crashlytics Firebase.Crashlytics 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=873305 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/Crashlytics/Crashlytics.targets b/source/Firebase/Crashlytics/Crashlytics.targets index e499af4f1..e2083bee8 100644 --- a/source/Firebase/Crashlytics/Crashlytics.targets +++ b/source/Firebase/Crashlytics/Crashlytics.targets @@ -2,7 +2,7 @@ <_FirebaseCrashlyticsAssemblyName>Firebase.Crashlytics, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - <_FirebaseCrashlyticsItemsFolder>FCrshlytcs-8.9.1 + <_FirebaseCrashlyticsItemsFolder>FCrshlytcs-8.13.0 <_FirebaseCrashlyticsSDKBaseFolder>$(XamarinBuildDownloadDir)$(_FirebaseCrashlyticsItemsFolder)\ <_FirebaseScriptName>upload-symbols.sh @@ -22,7 +22,7 @@ - https://raw.githubusercontent.com/firebase/firebase-ios-sdk/61a1f5be795abc92bb3cf57b9ac1e854bac64196/Crashlytics/upload-symbols + https://raw.githubusercontent.com/firebase/firebase-ios-sdk/4b4d62e13207751c6448d4b7b102ff42a94d409a/Crashlytics/upload-symbols $(_FirebaseCrashlyticsSDKBaseFolder)$(_FirebaseScriptName) Uncompressed diff --git a/source/Firebase/Database/Database.csproj b/source/Firebase/Database/Database.csproj index f34651374..fdbada83e 100644 --- a/source/Firebase/Database/Database.csproj +++ b/source/Firebase/Database/Database.csproj @@ -6,7 +6,7 @@ Firebase.Database Firebase.Database 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865568 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/DynamicLinks/DynamicLinks.csproj b/source/Firebase/DynamicLinks/DynamicLinks.csproj index 85a4ba304..1968dbe47 100644 --- a/source/Firebase/DynamicLinks/DynamicLinks.csproj +++ b/source/Firebase/DynamicLinks/DynamicLinks.csproj @@ -6,7 +6,7 @@ Firebase.DynamicLinks Firebase.DynamicLinks 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865537 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/InAppMessaging/InAppMessaging.csproj b/source/Firebase/InAppMessaging/InAppMessaging.csproj index 514456824..4e60c2a2a 100644 --- a/source/Firebase/InAppMessaging/InAppMessaging.csproj +++ b/source/Firebase/InAppMessaging/InAppMessaging.csproj @@ -6,7 +6,7 @@ Firebase.InAppMessaging Firebase.InAppMessaging 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=2125628 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/Installations/Installations.csproj b/source/Firebase/Installations/Installations.csproj index b47b30a60..c14bbf847 100644 --- a/source/Firebase/Installations/Installations.csproj +++ b/source/Firebase/Installations/Installations.csproj @@ -6,7 +6,7 @@ Firebase.Installations Firebase.Installations 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=2125908 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/PerformanceMonitoring/PerformanceMonitoring.csproj b/source/Firebase/PerformanceMonitoring/PerformanceMonitoring.csproj index 65034c457..248f9aad6 100644 --- a/source/Firebase/PerformanceMonitoring/PerformanceMonitoring.csproj +++ b/source/Firebase/PerformanceMonitoring/PerformanceMonitoring.csproj @@ -6,7 +6,7 @@ Firebase.PerformanceMonitoring Firebase.PerformanceMonitoring 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=866312 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/RemoteConfig/RemoteConfig.csproj b/source/Firebase/RemoteConfig/RemoteConfig.csproj index 50891e94d..7bedcd205 100644 --- a/source/Firebase/RemoteConfig/RemoteConfig.csproj +++ b/source/Firebase/RemoteConfig/RemoteConfig.csproj @@ -6,7 +6,7 @@ Firebase.RemoteConfig Firebase.RemoteConfig 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865532 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Firebase/Storage/Storage.csproj b/source/Firebase/Storage/Storage.csproj index aa9c980fb..28e1c7368 100644 --- a/source/Firebase/Storage/Storage.csproj +++ b/source/Firebase/Storage/Storage.csproj @@ -6,7 +6,7 @@ Firebase.Storage Firebase.Storage 1.0.0.0 - 8.10.0 + 8.15.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865545 License.md true - 8.10.0 + 8.15.0 diff --git a/source/Google/Maps/Maps.csproj b/source/Google/Maps/Maps.csproj index 1a0d7d9ee..d8c7ddc0c 100644 --- a/source/Google/Maps/Maps.csproj +++ b/source/Google/Maps/Maps.csproj @@ -6,7 +6,7 @@ Google.Maps Google.Maps 1.0.0.0 - 6.0.1.0 + 6.1.1.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=865548 License.md true - 6.0.1.0 + 6.1.1.0 diff --git a/source/Google/Maps/Maps.targets b/source/Google/Maps/Maps.targets index 209db05b7..148b6121d 100644 --- a/source/Google/Maps/Maps.targets +++ b/source/Google/Maps/Maps.targets @@ -2,14 +2,14 @@ <_GoogleMapsAssemblyName>Google.Maps, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - <_GoogleMapsItemsFolder>GMps-6.0.1 + <_GoogleMapsItemsFolder>GMps-6.1.1 <_GoogleMapsSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleMapsItemsFolder)\Maps\Frameworks\ <_GoogleMapsBaseSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleMapsItemsFolder)\Base\Frameworks\ - https://dl.google.com/dl/cpdc/1c27a020313febc7/GoogleMaps-6.0.1.tar.gz + https://dl.google.com/dl/cpdc/e028d849b9a6561a/GoogleMaps-6.1.1.tar.gz Tgz diff --git a/source/Google/MobileAds/ApiDefinition.cs b/source/Google/MobileAds/ApiDefinition.cs index 2010675ca..1359020c9 100644 --- a/source/Google/MobileAds/ApiDefinition.cs +++ b/source/Google/MobileAds/ApiDefinition.cs @@ -349,11 +349,11 @@ interface MediaContent { nfloat AspectRatio { get; } // @property (readonly, nonatomic) NSTimeInterval duration; - [Export("duration")] + [Export ("duration")] double Duration { get; } // @property (readonly, nonatomic) NSTimeInterval currentTime; - [Export("currentTime")] + [Export ("currentTime")] double CurrentTime { get; } /// @@ -385,9 +385,6 @@ interface Request : INSCopying { [Export ("removeAdNetworkExtrasFor:")] void RemoveAdNetworkExtrasFor (Class aClass); - [Export ("setLocationWithLatitude:longitude:accuracy:")] - void SetLocation (nfloat latitude, nfloat longitude, nfloat accuracyInMeters); - [NullAllowed] [Export ("keywords", ArgumentSemantic.Copy)] string [] Keywords { get; set; } @@ -398,7 +395,7 @@ interface Request : INSCopying { [NullAllowed] [Export ("neighboringContentURLStrings", ArgumentSemantic.Copy)] - string[] NeighboringContentUrlStrings { get; set; } + string [] NeighboringContentUrlStrings { get; set; } [NullAllowed] [Export ("requestAgent", ArgumentSemantic.Copy)] @@ -406,22 +403,21 @@ interface Request : INSCopying { } [Static] - interface MaxAdContentRatingConstants - { + interface MaxAdContentRatingConstants { // GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingGeneral; - [Field("GADMaxAdContentRatingGeneral", "__Internal")] + [Field ("GADMaxAdContentRatingGeneral", "__Internal")] NSString General { get; } // GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingParentalGuidance; - [Field("GADMaxAdContentRatingParentalGuidance", "__Internal")] + [Field ("GADMaxAdContentRatingParentalGuidance", "__Internal")] NSString ParentalGuidance { get; } // GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingTeen; - [Field("GADMaxAdContentRatingTeen", "__Internal")] + [Field ("GADMaxAdContentRatingTeen", "__Internal")] NSString Teen { get; } // GAD_EXTERN GADMaxAdContentRating _Nonnull const GADMaxAdContentRatingMatureAudience; - [Field("GADMaxAdContentRatingMatureAudience", "__Internal")] + [Field ("GADMaxAdContentRatingMatureAudience", "__Internal")] NSString MatureAudience { get; } } @@ -435,7 +431,7 @@ interface RequestConfiguration { // @property (copy, nonatomic) NSArray * _Nullable testDeviceIdentifiers; [NullAllowed, Export ("testDeviceIdentifiers", ArgumentSemantic.Copy)] - string[] TestDeviceIdentifiers { get; set; } + string [] TestDeviceIdentifiers { get; set; } // -(void)tagForUnderAgeOfConsent:(BOOL)underAgeOfConsent; [Export ("tagForUnderAgeOfConsent:")] @@ -451,17 +447,12 @@ interface RequestConfiguration { } // @interface GADAdNetworkResponseInfo : NSObject - [BaseType (typeof(NSObject), Name = "GADAdNetworkResponseInfo")] - interface AdNetworkResponseInfo - { + [BaseType (typeof (NSObject), Name = "GADAdNetworkResponseInfo")] + interface AdNetworkResponseInfo { // @property(nonatomic, readonly, nonnull) NSString *adNetworkClassName; [Export ("responseIdentifier")] string AdNetworkClassName { get; } - // @property(nonatomic, readonly, nonnull) NSDictionary *adUnitMapping; - [Export ("adUnitMapping")] - NSDictionary AdUnitMapping { get; } - // @property(nonatomic, readonly, nullable) NSError *error; [NullAllowed] [Export ("error")] @@ -482,9 +473,8 @@ interface AdNetworkResponseInfo } // @interface GADResponseInfo : NSObject - [BaseType (typeof(NSObject), Name = "GADResponseInfo")] - interface ResponseInfo - { + [BaseType (typeof (NSObject), Name = "GADResponseInfo")] + interface ResponseInfo { // extern NSString *const _Nonnull GADGoogleAdNetworkClassName; [Field ("GADGoogleAdNetworkClassName", "__Internal")] NSString GoogleAdNetworkClassName { get; } @@ -509,7 +499,7 @@ interface ResponseInfo // @property(nonatomic, readonly, nonnull) NSArray *adNetworkInfoArray; [Export ("adNetworkInfoArray")] - AdNetworkResponseInfo[] AdNetworkInfo { get; } + AdNetworkResponseInfo [] AdNetworkInfo { get; } // @property(nonatomic, readonly, nonnull) NSDictionary *dictionaryRepresentation; [Export ("dictionaryRepresentation")] @@ -610,19 +600,18 @@ interface AdSizeDelegate { delegate void PaidEventHandler (AdValue value); // @interface GADAdValue : NSObject - [BaseType(typeof(NSObject), Name = "GADAdValue")] - interface AdValue : INSCopying - { + [BaseType (typeof (NSObject), Name = "GADAdValue")] + interface AdValue : INSCopying { // @property (readonly, nonatomic) GADAdValuePrecision precision; - [Export("precision")] + [Export ("precision")] AdValuePrecision Precision { get; } // @property (readonly, nonatomic) NSDecimalNumber * _Nonnull value; - [Export("value")] + [Export ("value")] NSDecimalNumber Value { get; } // @property (readonly, nonatomic) NSString * _Nonnull currencyCode; - [Export("currencyCode")] + [Export ("currencyCode")] string CurrencyCode { get; } } @@ -669,11 +658,11 @@ interface FullScreenContentDelegate { [Export ("ad:didFailToPresentFullScreenContentWithError:")] void DidFailToPresentFullScreenContent (FullScreenPresentingAd ad, NSError error); - // - (void)adDidPresentFullScreenContent:(nonnull id)ad; + // - (void)adWillPresentFullScreenContent:(nonnull id)ad; [EventArgs ("FullScreenPresentingAd")] [EventName ("PresentedContent")] - [Export ("adDidPresentFullScreenContent:")] - void DidPresentFullScreenContent (FullScreenPresentingAd ad); + [Export ("adWillresentFullScreenContent:")] + void WillPresentFullScreenContent (FullScreenPresentingAd ad); // - (void)adWillDismissFullScreenContent:(nonnull id)ad; [EventArgs ("FullScreenPresentingAd")] @@ -920,7 +909,7 @@ interface NativeAd { // - (void)muteThisAdWithReason:(nullable GADMuteThisAdReason *)reason; [Export ("muteThisAdWithReason:")] void MuteThisAd (MuteThisAdReason reason); - + /// /// From NativeAd_ConfirmationClick Category /// @@ -1081,7 +1070,7 @@ interface NativeAdAssetIdentifiers { // typedef void (^GADNativeAdCustomClickHandler)(NSString* assetID); delegate void NativeAdCustomClickHandle (string assetId); - + // @interface GADCustomNativeAd : UIView [BaseType (typeof (UIView), Name = "GADCustomNativeAd")] interface CustomNativeAd { @@ -1096,7 +1085,7 @@ interface CustomNativeAd { // @property(nonatomic, readonly, nonnull) NSArray *availableAssetKeys; [Export ("availableAssetKeys")] - string[] AvailableAssetKeys { get; } + string [] AvailableAssetKeys { get; } // @property(atomic, copy, nullable) GADNativeAdCustomClickHandler customClickHandler; [NullAllowed] @@ -1131,7 +1120,7 @@ interface CustomNativeAd { [return: NullAllowed] [Export ("imageForKey:")] NativeAdImage ImageForKey (NSString key); - + // - (nullable NSString *)stringForKey:(nonnull NSString *)key; [return: NullAllowed] [Export ("stringForKey:")] @@ -1140,13 +1129,29 @@ interface CustomNativeAd { // - (void)performClickOnAssetWithKey:(nonnull NSString *)assetKey; [return: NullAllowed] [Export ("performClickOnAssetWithKey:")] - void RecordImpression (NSString assetKey); + void PerformClickOnAsset (NSString assetKey); // - (void)recordImpression; [Export ("recordImpression")] void RecordImpression (); } + // @protocol GADCustomNativeAdLoaderDelegate + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADCustomNativeAdLoaderDelegate")] + interface CustomNativeAdLoaderDelegate : AdLoaderDelegate + { + // @required -(NSArray * _Nonnull)customNativeAdFormatIDsForAdLoader:(GADAdLoader * _Nonnull)adLoader; + [Abstract] + [Export ("customNativeAdFormatIDsForAdLoader:")] + string[] CustomNativeAdFormatIdsForAdLoader (AdLoader adLoader); + + // @required -(void)adLoader:(GADAdLoader * _Nonnull)adLoader didReceiveCustomNativeAd:(GADCustomNativeAd * _Nonnull)customNativeAd; + [Abstract] + [Export ("adLoader:didReceiveCustomNativeAd:")] + void AdLoader (AdLoader adLoader, CustomNativeAd customNativeAd); + } interface ICustomNativeAdDelegate { } @@ -1339,7 +1344,7 @@ interface AdLoader { [Export ("loadRequest:")] void LoadRequest ([NullAllowed] Request request); } - + // @protocol GADAdMetadataProvider [Model (AutoGeneratedName = true)] [Protocol] @@ -1465,7 +1470,7 @@ interface NativeAdViewAdOptions { [Export ("preferredAdChoicesPosition", ArgumentSemantic.Assign)] AdChoicesPosition PreferredAdChoicesPosition { get; set; } } - + #endregion #region Loading.Options @@ -1497,9 +1502,9 @@ interface NativeAdMediaAdLoaderOptions { #region Mediation interface ICustomEventBanner { - } + [Obsolete ("Use MediationBannerAd and MediationAdapter instead.")] [Protocol (Name = "GADCustomEventBanner")] interface CustomEventBanner { [Abstract] @@ -1517,9 +1522,9 @@ interface CustomEventBanner { } interface ICustomEventBannerDelegate { - } + [Obsolete ("Use MediationBannerAdEventDelegate instead.")] [Model (AutoGeneratedName = true)] [Protocol] [BaseType (typeof (NSObject), Name = "GADCustomEventBannerDelegate")] @@ -1553,7 +1558,7 @@ interface CustomEventBannerDelegate { [Export ("customEventBannerDidDismissModal:")] void DidDismissModal (ICustomEventBanner customEvent); - [Obsolete("Deprecated. No replacement.")] + [Obsolete ("Deprecated. No replacement.")] [Abstract] [Export ("customEventBannerWillLeaveApplication:")] void WillLeaveApplication (ICustomEventBanner customEvent); @@ -1579,9 +1584,9 @@ interface CustomEventExtras : AdNetworkExtras { } interface ICustomEventInterstitial { - } + [Obsolete ("Use MediationInterstitialAd and MediationAdapter instead.")] [Protocol (Name = "GADCustomEventInterstitial")] interface CustomEventInterstitial { @@ -1604,9 +1609,9 @@ interface CustomEventInterstitial { } interface ICustomEventInterstitialDelegate { - } + [Obsolete ("Use MediationInterstitialAdEventDelegate instead.")] [Model (AutoGeneratedName = true)] [Protocol] [BaseType (typeof (NSObject), Name = "GADCustomEventInterstitialDelegate")] @@ -1629,7 +1634,7 @@ interface CustomEventInterstitialDelegate { [Export ("customEventInterstitialDidDismiss:")] void DidDismiss (ICustomEventInterstitial customEvent); - [Obsolete("Deprecated. No replacement.")] + [Obsolete ("Deprecated. No replacement.")] [Export ("customEventInterstitialWillLeaveApplication:")] void WillLeaveApplication (ICustomEventInterstitial customEvent); } @@ -1638,6 +1643,7 @@ interface ICustomEventNativeAd { } // @protocol GADCustomEventNativeAd + [Obsolete ("Use MediationNativeAd and MediationAdapter instead.")] [Model (AutoGeneratedName = true)] [Protocol] [BaseType (typeof (NSObject), Name = "GADCustomEventNativeAd")] @@ -1671,6 +1677,7 @@ interface CustomEventNativeAd { interface ICustomEventNativeAdDelegate { } + [Obsolete ("Use MediationNativeAdEventDelegate instead.")] [Model (AutoGeneratedName = true)] [Protocol] [BaseType (typeof (NSObject), Name = "GADCustomEventNativeAdDelegate")] @@ -1687,23 +1694,7 @@ interface CustomEventNativeAdDelegate { } [BaseType (typeof (NSObject), Name = "GADCustomEventRequest")] - interface CustomEventRequest { - [Export ("userHasLocation", ArgumentSemantic.Assign)] - bool UserHasLocation { get; } - - [Export ("userLatitude", ArgumentSemantic.Assign)] - nfloat UserLatitude { get; } - - [Export ("userLongitude", ArgumentSemantic.Assign)] - nfloat UserLongitude { get; } - - [Export ("userLocationAccuracyInMeters", ArgumentSemantic.Assign)] - nfloat UserLocationAccuracyInMeters { get; } - - [NullAllowed] - [Export ("userLocationDescription", ArgumentSemantic.Copy)] - string UserLocationDescription { get; } - + interface CustomEventRequest { [NullAllowed] [Export ("userKeywords", ArgumentSemantic.Copy)] NSObject [] UserKeywords { get; } @@ -2027,7 +2018,6 @@ interface BannerAdLoaderDelegate : Google.MobileAds.AdLoaderDelegate { interface BannerView { [Export ("initWithFrame:")] - IntPtr Constructor (CGRect frame); [Export ("initWithAdSize:origin:")] @@ -2252,4 +2242,724 @@ interface MediatedUnifiedNativeAd { [Export ("didUntrackView:")] void DidUntrackView ([NullAllowed] UIView view); } + + // @protocol GADMAdNetworkAdapter + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMAdNetworkAdapter")] + interface AdNetworkAdapter { + // @required +(NSString *)adapterVersion; + [Static] + [Export ("adapterVersion")] + string AdapterVersion { get; } + + // @required +(Class)networkExtrasClass; + [Static] + [Export ("networkExtrasClass")] + AdNetworkExtras NetworkExtrasClass { get; } + + // @required -(instancetype)initWithGADMAdNetworkConnector:(id)connector; + [Export ("initWithGADMAdNetworkConnector:")] + IntPtr Constructor (AdNetworkConnector connector); + + // @required -(void)getBannerWithSize:(GADAdSize)adSize; + [Export ("getBannerWithSize:")] + void GetBannerWithSize (AdSize adSize); + + // @required -(void)getInterstitial; + [Export ("getInterstitial")] + void GetInterstitial (); + + // @required -(void)stopBeingDelegate; + [Export ("stopBeingDelegate")] + void StopBeingDelegate (); + + // @required -(void)presentInterstitialFromRootViewController:(UIViewController *)rootViewController; + [Export ("presentInterstitialFromRootViewController:")] + void PresentInterstitialFromRootViewController (UIViewController rootViewController); + + // @optional -(void)getNativeAdWithAdTypes:(NSArray *)adTypes options:(NSArray *)options; + [Export ("getNativeAdWithAdTypes:options:")] + void GetNativeAdWithAdTypes (string [] adTypes, AdLoaderOptions [] options); + + // @optional -(BOOL)handlesUserClicks; + [Export ("handlesUserClicks")] + bool HandlesUserClicks { get; } + + // @optional -(BOOL)handlesUserImpressions; + [Export ("handlesUserImpressions")] + bool HandlesUserImpressions { get; } + + // @optional -(void)changeAdSizeTo:(GADAdSize)adSize; + [Export ("changeAdSizeTo:")] + void ChangeAdSizeTo (AdSize adSize); + } + + // @protocol GADMAdNetworkConnector + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMAdNetworkConnector")] + interface AdNetworkConnector : MediationAdRequest { + // @required -(UIViewController *)viewControllerForPresentingModalView; + [Abstract] + [Export ("viewControllerForPresentingModalView")] + UIViewController ViewControllerForPresentingModalView { get; } + + // @required -(float)adVolume; + [Abstract] + [Export ("adVolume")] + float AdVolume { get; } + + // @required -(BOOL)adMuted; + [Abstract] + [Export ("adMuted")] + bool AdMuted { get; } + + // @required -(void)adapter:(id)adapter didFailAd:(NSError *)error; + [Abstract] + [Export ("adapter:didFailAd:")] + void Adapter (AdNetworkAdapter adapter, NSError error); + + // @required -(void)adapter:(id)adapter didReceiveAdView:(UIView *)view; + [Abstract] + [Export ("adapter:didReceiveAdView:")] + void Adapter (AdNetworkAdapter adapter, UIView view); + + // @required -(void)adapterDidReceiveInterstitial:(id)adapter; + [Abstract] + [Export ("adapterDidReceiveInterstitial:")] + void AdapterDidReceiveInterstitial (AdNetworkAdapter adapter); + + // @required -(void)adapter:(id)adapter didReceiveMediatedUnifiedNativeAd:(id)mediatedUnifiedNativeAd; + [Abstract] + [Export ("adapter:didReceiveMediatedUnifiedNativeAd:")] + void Adapter (AdNetworkAdapter adapter, MediatedUnifiedNativeAd mediatedUnifiedNativeAd); + + // @required -(void)adapterDidGetAdClick:(id)adapter; + [Abstract] + [Export ("adapterDidGetAdClick:")] + void AdapterDidGetAdClick (AdNetworkAdapter adapter); + + // @required -(void)adapterWillPresentFullScreenModal:(id)adapter; + [Abstract] + [Export ("adapterWillPresentFullScreenModal:")] + void AdapterWillPresentFullScreenModal (AdNetworkAdapter adapter); + + // @required -(void)adapterWillDismissFullScreenModal:(id)adapter; + [Abstract] + [Export ("adapterWillDismissFullScreenModal:")] + void AdapterWillDismissFullScreenModal (AdNetworkAdapter adapter); + + // @required -(void)adapterDidDismissFullScreenModal:(id)adapter; + [Abstract] + [Export ("adapterDidDismissFullScreenModal:")] + void AdapterDidDismissFullScreenModal (AdNetworkAdapter adapter); + + // @required -(void)adapterWillPresentInterstitial:(id)adapter; + [Abstract] + [Export ("adapterWillPresentInterstitial:")] + void AdapterWillPresentInterstitial (AdNetworkAdapter adapter); + + // @required -(void)adapterWillDismissInterstitial:(id)adapter; + [Abstract] + [Export ("adapterWillDismissInterstitial:")] + void AdapterWillDismissInterstitial (AdNetworkAdapter adapter); + + // @required -(void)adapterDidDismissInterstitial:(id)adapter; + [Abstract] + [Export ("adapterDidDismissInterstitial:")] + void AdapterDidDismissInterstitial (AdNetworkAdapter adapter); + + // @required -(void)adapter:(id)adapter didReceiveInterstitial:(NSObject *)interstitial __attribute__((deprecated("Use -adapterDidReceiveInterstitial:."))); + [Abstract] + [Export ("adapter:didReceiveInterstitial:")] + void Adapter (AdNetworkAdapter adapter, NSObject interstitial); + + // @required -(void)adapter:(id)adapter clickDidOccurInBanner:(UIView *)view __attribute__((deprecated("Use -adapterDidGetAdClick:."))); + [Abstract] + [Export ("adapter:clickDidOccurInBanner:")] + void AdapterClickDidOccurInBanner (AdNetworkAdapter adapter, UIView view); + + // @required -(void)adapter:(id)adapter didFailInterstitial:(NSError *)error __attribute__((deprecated("Use -adapter:didFailAd:"))); + [Abstract] + [Export ("adapter:didFailInterstitial:")] + void AdapterDidFailInterstitial (AdNetworkAdapter adapter, NSError error); + + // @required -(void)adapterWillLeaveApplication:(id)adapter __attribute__((deprecated("Deprecated. No replacement."))); + [Abstract] + [Export ("adapterWillLeaveApplication:")] + void AdapterWillLeaveApplication (AdNetworkAdapter adapter); + } + + // @interface GADMediatedUnifiedNativeAdNotificationSource : NSObject + [BaseType (typeof (NSObject), Name = "GADMediatedUnifiedNativeAdNotificationSource")] + interface GADMediatedUnifiedNativeAdNotificationSource { + // +(void)mediatedNativeAdDidRecordImpression:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdDidRecordImpression:")] + void MediatedNativeAdDidRecordImpression (MediatedUnifiedNativeAd mediatedNativeAd); + + // +(void)mediatedNativeAdDidRecordClick:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdDidRecordClick:")] + void MediatedNativeAdDidRecordClick (MediatedUnifiedNativeAd mediatedNativeAd); + + // +(void)mediatedNativeAdWillPresentScreen:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdWillPresentScreen:")] + void MediatedNativeAdWillPresentScreen (MediatedUnifiedNativeAd mediatedNativeAd); + + // +(void)mediatedNativeAdWillDismissScreen:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdWillDismissScreen:")] + void MediatedNativeAdWillDismissScreen (MediatedUnifiedNativeAd mediatedNativeAd); + + // +(void)mediatedNativeAdDidDismissScreen:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdDidDismissScreen:")] + void MediatedNativeAdDidDismissScreen (MediatedUnifiedNativeAd mediatedNativeAd); + + // +(void)mediatedNativeAdDidPlayVideo:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdDidPlayVideo:")] + void MediatedNativeAdDidPlayVideo (MediatedUnifiedNativeAd mediatedNativeAd); + + // +(void)mediatedNativeAdDidPauseVideo:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdDidPauseVideo:")] + void MediatedNativeAdDidPauseVideo (MediatedUnifiedNativeAd mediatedNativeAd); + + // +(void)mediatedNativeAdDidEndVideoPlayback:(id _Nonnull)mediatedNativeAd; + [Static] + [Export ("mediatedNativeAdDidEndVideoPlayback:")] + void MediatedNativeAdDidEndVideoPlayback (MediatedUnifiedNativeAd mediatedNativeAd); + } + + // @protocol GADMediationAd + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationAd")] + interface MediationAd { + } + + // typedef id _Nullable (^GADMediationBannerLoadCompletionHandler)(id _Nullable, NSError * _Nullable); + delegate MediationBannerAdEventDelegate MediationBannerLoadCompletionHandler ([NullAllowed] MediationBannerAd mediationBannerAd, [NullAllowed] NSError error); + + // typedef id _Nullable (^GADMediationInterscrollerAdLoadCompletionHandler)(id _Nullable, NSError * _Nullable); + delegate MediationBannerAdEventDelegate MediationInterscrollerAdLoadCompletionHandler ([NullAllowed] MediationInterscrollerAd mediationInterscrollerAd, [NullAllowed] NSError error); + + // typedef id _Nullable (^GADMediationInterstitialLoadCompletionHandler)(id _Nullable, NSError * _Nullable); + delegate MediationInterstitialAdEventDelegate MediationInterstitialLoadCompletionHandler ([NullAllowed] MediationInterstitialAd mediationInterstitialAd, [NullAllowed] NSError error); + + // typedef id _Nullable (^GADMediationNativeLoadCompletionHandler)(id _Nullable, NSError * _Nullable); + delegate MediationNativeAdEventDelegate MediationNativeLoadCompletionHandler ([NullAllowed] MediationNativeAd mediationNativeAd, [NullAllowed] NSError error); + + // typedef id _Nullable (^GADMediationRewardedLoadCompletionHandler)(id _Nullable, NSError * _Nullable); + delegate MediationNativeAdEventDelegate MediationRewardedLoadCompletionHandler ([NullAllowed] MediationRewardedAd mediationRewardedAd, [NullAllowed] NSError error); + + // typedef void (^GADMediationAdapterSetUpCompletionBlock)(NSError * _Nullable); + delegate void MediationAdapterSetUpCompletionBlock ([NullAllowed] NSError error); + + // @protocol GADMediationAdapter + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationAdapter")] + interface MediationAdapter { + // @required +(GADVersionNumber)adapterVersion; + [Static, Abstract] + [Export ("adapterVersion")] + VersionNumber AdapterVersion { get; } + + // @required +(GADVersionNumber)adSDKVersion; + [Static, Abstract] + [Export ("adSDKVersion")] + VersionNumber AdSdkVersion { get; } + + // @required +(Class _Nullable)networkExtrasClass; + [Static, Abstract] + [NullAllowed, Export ("networkExtrasClass")] + AdNetworkExtras NetworkExtrasClass { get; } + + // @optional +(void)setUpWithConfiguration:(GADMediationServerConfiguration * _Nonnull)configuration completionHandler:(GADMediationAdapterSetUpCompletionBlock _Nonnull)completionHandler; + [Static] + [Export ("setUpWithConfiguration:completionHandler:")] + void SetUpWithConfiguration (MediationServerConfiguration configuration, MediationAdapterSetUpCompletionBlock completionHandler); + + // @optional -(void)loadBannerForAdConfiguration:(GADMediationBannerAdConfiguration * _Nonnull)adConfiguration completionHandler:(GADMediationBannerLoadCompletionHandler _Nonnull)completionHandler; + [Export ("loadBannerForAdConfiguration:completionHandler:")] + void LoadBannerForAdConfiguration (MediationBannerAdConfiguration adConfiguration, MediationBannerLoadCompletionHandler completionHandler); + + // @optional -(void)loadInterscrollerAdForAdConfiguration:(GADMediationBannerAdConfiguration * _Nonnull)adConfiguration completionHandler:(GADMediationInterscrollerAdLoadCompletionHandler _Nonnull)completionHandler; + [Export ("loadInterscrollerAdForAdConfiguration:completionHandler:")] + void LoadInterscrollerAdForAdConfiguration (MediationBannerAdConfiguration adConfiguration, MediationInterscrollerAdLoadCompletionHandler completionHandler); + + // @optional -(void)loadInterstitialForAdConfiguration:(GADMediationInterstitialAdConfiguration * _Nonnull)adConfiguration completionHandler:(GADMediationInterstitialLoadCompletionHandler _Nonnull)completionHandler; + [Export ("loadInterstitialForAdConfiguration:completionHandler:")] + void LoadInterstitialForAdConfiguration (MediationInterstitialAdConfiguration adConfiguration, MediationInterstitialLoadCompletionHandler completionHandler); + + // @optional -(void)loadNativeAdForAdConfiguration:(GADMediationNativeAdConfiguration * _Nonnull)adConfiguration completionHandler:(GADMediationNativeLoadCompletionHandler _Nonnull)completionHandler; + [Export ("loadNativeAdForAdConfiguration:completionHandler:")] + void LoadNativeAdForAdConfiguration (MediationNativeAdConfiguration adConfiguration, MediationNativeLoadCompletionHandler completionHandler); + + // @optional -(void)loadRewardedAdForAdConfiguration:(GADMediationRewardedAdConfiguration * _Nonnull)adConfiguration completionHandler:(GADMediationRewardedLoadCompletionHandler _Nonnull)completionHandler; + [Export ("loadRewardedAdForAdConfiguration:completionHandler:")] + void LoadRewardedAdForAdConfiguration (MediationRewardedAdConfiguration adConfiguration, MediationRewardedLoadCompletionHandler completionHandler); + + // @optional -(void)loadRewardedInterstitialAdForAdConfiguration:(GADMediationRewardedAdConfiguration * _Nonnull)adConfiguration completionHandler:(GADMediationRewardedLoadCompletionHandler _Nonnull)completionHandler; + [Export ("loadRewardedInterstitialAdForAdConfiguration:completionHandler:")] + void LoadRewardedInterstitialAdForAdConfiguration (MediationRewardedAdConfiguration adConfiguration, MediationRewardedLoadCompletionHandler completionHandler); + } + + // @interface GADMediationAdConfiguration : NSObject + [BaseType (typeof (NSObject), Name = "GADMediationAdConfiguration")] + interface MediationAdConfiguration { + // @property (readonly, nonatomic) NSString * _Nullable bidResponse; + [NullAllowed, Export ("bidResponse")] + string BidResponse { get; } + + // @property (readonly, nonatomic) UIViewController * _Nullable topViewController; + [NullAllowed, Export ("topViewController")] + UIViewController TopViewController { get; } + + // @property (readonly, nonatomic) GADMediationCredentials * _Nonnull credentials; + [Export ("credentials")] + MediationCredentials Credentials { get; } + + // @property (readonly, nonatomic) NSData * _Nullable watermark; + [NullAllowed, Export ("watermark")] + NSData Watermark { get; } + + // @property (readonly, nonatomic) id _Nullable extras; + [NullAllowed, Export ("extras")] + AdNetworkExtras Extras { get; } + + // @property (readonly, nonatomic) NSNumber * _Nullable childDirectedTreatment; + [NullAllowed, Export ("childDirectedTreatment")] + NSNumber ChildDirectedTreatment { get; } + + // @property (readonly, nonatomic) BOOL isTestRequest; + [Export ("isTestRequest")] + bool IsTestRequest { get; } + + // @property (readonly, nonatomic) BOOL hasUserLocation; + [Export ("hasUserLocation")] + bool HasUserLocation { get; } + + // @property (readonly, nonatomic) CGFloat userLatitude; + [Export ("userLatitude")] + nfloat UserLatitude { get; } + + // @property (readonly, nonatomic) CGFloat userLongitude; + [Export ("userLongitude")] + nfloat UserLongitude { get; } + + // @property (readonly, nonatomic) CGFloat userLocationAccuracyInMeters; + [Export ("userLocationAccuracyInMeters")] + nfloat UserLocationAccuracyInMeters { get; } + } + + // @protocol GADMediationAdEventDelegate + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationAdEventDelegate")] + interface MediationAdEventDelegate { + // @required -(void)reportImpression; + [Abstract] + [Export ("reportImpression")] + void ReportImpression (); + + // @required -(void)reportClick; + [Abstract] + [Export ("reportClick")] + void ReportClick (); + + // @required -(void)willPresentFullScreenView; + [Abstract] + [Export ("willPresentFullScreenView")] + void WillPresentFullScreenView (); + + // @required -(void)didFailToPresentWithError:(NSError * _Nonnull)error; + [Abstract] + [Export ("didFailToPresentWithError:")] + void DidFailToPresentWithError (NSError error); + + // @required -(void)willDismissFullScreenView; + [Abstract] + [Export ("willDismissFullScreenView")] + void WillDismissFullScreenView (); + + // @required -(void)didDismissFullScreenView; + [Abstract] + [Export ("didDismissFullScreenView")] + void DidDismissFullScreenView (); + } + + // @protocol GADMediationBannerAdEventDelegate + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "MediationBannerAdEventDelegate")] + interface MediationBannerAdEventDelegate : MediationAdEventDelegate { + // @required -(void)willBackgroundApplication __attribute__((deprecated("Deprecated. No replacement."))); + [Abstract] + [Export ("willBackgroundApplication")] + void WillBackgroundApplication (); + } + + // @protocol GADMediationInterstitialAdEventDelegate + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationInterstitialAdEventDelegate")] + interface MediationInterstitialAdEventDelegate : MediationAdEventDelegate { + // @required -(void)willBackgroundApplication __attribute__((deprecated("Deprecated. No replacement."))); + [Abstract] + [Export ("willBackgroundApplication")] + void WillBackgroundApplication (); + } + + // @protocol GADMediationNativeAdEventDelegate + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationNativeAdEventDelegate")] + interface MediationNativeAdEventDelegate : MediationAdEventDelegate { + // @required -(void)didPlayVideo; + [Abstract] + [Export ("didPlayVideo")] + void DidPlayVideo (); + + // @required -(void)didPauseVideo; + [Abstract] + [Export ("didPauseVideo")] + void DidPauseVideo (); + + // @required -(void)didEndVideo; + [Abstract] + [Export ("didEndVideo")] + void DidEndVideo (); + + // @required -(void)didMuteVideo; + [Abstract] + [Export ("didMuteVideo")] + void DidMuteVideo (); + + // @required -(void)didUnmuteVideo; + [Abstract] + [Export ("didUnmuteVideo")] + void DidUnmuteVideo (); + + // @required -(void)willBackgroundApplication __attribute__((deprecated("Deprecated. No replacement."))); + [Abstract] + [Export ("willBackgroundApplication")] + void WillBackgroundApplication (); + } + + // @protocol GADMediationRewardedAdEventDelegate + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationRewardedAdEventDelegate")] + interface MediationRewardedAdEventDelegate : MediationAdEventDelegate { + // @required -(void)didRewardUserWithReward:(GADAdReward * _Nonnull)reward; + [Abstract] + [Export ("didRewardUserWithReward:")] + void DidRewardUserWithReward (AdReward reward); + + // @required -(void)didStartVideo; + [Abstract] + [Export ("didStartVideo")] + void DidStartVideo (); + + // @required -(void)didEndVideo; + [Abstract] + [Export ("didEndVideo")] + void DidEndVideo (); + } + + // @protocol GADMediationAdRequest + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationAdRequest")] + interface MediationAdRequest { + // @required -(NSString * _Nullable)publisherId; + [Abstract] + [NullAllowed, Export ("publisherId")] + string PublisherId { get; } + + // @required -(NSDictionary * _Nullable)credentials; + [Abstract] + [NullAllowed, Export ("credentials")] + NSDictionary Credentials { get; } + + // @required -(BOOL)testMode; + [Abstract] + [Export ("testMode")] + bool TestMode { get; } + + // @required -(id _Nullable)networkExtras; + [Abstract] + [NullAllowed, Export ("networkExtras")] + AdNetworkExtras NetworkExtras { get; } + + // @required -(NSNumber * _Nullable)childDirectedTreatment; + [Abstract] + [NullAllowed, Export ("childDirectedTreatment")] + NSNumber ChildDirectedTreatment { get; } + + // @required -(GADMaxAdContentRating _Nullable)maxAdContentRating; + [Abstract] + [NullAllowed, Export ("maxAdContentRating")] + string MaxAdContentRating { get; } + + // @required -(NSNumber * _Nullable)underAgeOfConsent; + [Abstract] + [NullAllowed, Export ("underAgeOfConsent")] + NSNumber UnderAgeOfConsent { get; } + + // @required -(NSArray * _Nullable)userKeywords; + [Abstract] + [NullAllowed, Export ("userKeywords")] + NSString [] UserKeywords { get; } + } + + // @protocol GADMediationBannerAd + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationBannerAd")] + interface MediationBannerAd : MediationAd { + // @required @property (readonly, nonatomic) UIView * _Nonnull view; + [Abstract] + [Export ("view")] + UIView View { get; } + + // @optional -(void)changeAdSizeTo:(GADAdSize)adSize; + [Export ("changeAdSizeTo:")] + void ChangeAdSizeTo (AdSize adSize); + } + + // @protocol GADMediationInterscrollerAd + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationInterscrollerAd")] + interface MediationInterscrollerAd : MediationAd { + // @required @property (assign, nonatomic) BOOL delegateInterscrollerEffect; + [Abstract] + [Export ("delegateInterscrollerEffect")] + bool DelegateInterscrollerEffect { get; set; } + } + + // @interface GADMediationBannerAdConfiguration : GADMediationAdConfiguration + [BaseType (typeof (MediationAdConfiguration), Name = "GADMediationBannerAdConfiguration")] + interface MediationBannerAdConfiguration { + // @property (readonly, nonatomic) GADAdSize adSize; + [Export ("adSize")] + AdSize AdSize { get; } + } + + // @protocol GADMediationInterstitialAd + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationInterstitialAd")] + interface MediationInterstitialAd : MediationAd { + // @required -(void)presentFromViewController:(UIViewController * _Nonnull)viewController; + [Abstract] + [Export ("presentFromViewController:")] + void PresentFromViewController (UIViewController viewController); + } + + // @interface GADMediationInterstitialAdConfiguration : GADMediationAdConfiguration + [BaseType (typeof (MediationAdConfiguration), Name = "GADMediationInterstitialAdConfiguration")] + interface MediationInterstitialAdConfiguration { + } + + // @protocol GADMediationNativeAd + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationNativeAd")] + interface MediationNativeAd : MediationAd, MediatedUnifiedNativeAd { + // @optional -(BOOL)handlesUserClicks; + [Export ("handlesUserClicks")] + bool HandlesUserClicks { get; } + + // @optional -(BOOL)handlesUserImpressions; + [Export ("handlesUserImpressions")] + bool HandlesUserImpressions { get; } + } + + // @interface GADMediationNativeAdConfiguration : GADMediationAdConfiguration + [BaseType (typeof (MediationAdConfiguration), Name = "GADMediationNativeAdConfiguration")] + interface MediationNativeAdConfiguration { + // @property (readonly, nonatomic) NSArray * _Nonnull options; + [Export ("options")] + AdLoaderOptions [] Options { get; } + } + + // @protocol GADMediationRewardedAd + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMediationRewardedAd")] + interface MediationRewardedAd : MediationAd { + // @required -(void)presentFromViewController:(UIViewController * _Nonnull)viewController; + [Abstract] + [Export ("presentFromViewController:")] + void PresentFromViewController (UIViewController viewController); + } + + // @interface GADMediationRewardedAdConfiguration : GADMediationAdConfiguration + [BaseType (typeof (MediationAdConfiguration), Name = "GADMediationRewardedAdConfiguration")] + interface MediationRewardedAdConfiguration { + } + + // @interface GADMediationCredentials : NSObject + [BaseType (typeof (NSObject), Name = "GADMediationCredentials")] + interface MediationCredentials { + // @property (readonly, nonatomic) NSDictionary * _Nonnull settings; + [Export ("settings")] + NSDictionary Settings { get; } + + // @property (readonly, nonatomic) GADAdFormat format; + [Export ("format")] + AdFormat Format { get; } + } + + // @interface GADMediationServerConfiguration : NSObject + [BaseType (typeof (NSObject), Name = "GADMediationServerConfiguration")] + interface MediationServerConfiguration { + // @property (readonly, nonatomic) NSArray * _Nonnull credentials; + [Export ("credentials")] + MediationCredentials [] Credentials { get; } + } + + // @protocol GADMRewardBasedVideoAdNetworkAdapter + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMRewardBasedVideoAdNetworkAdapter")] + interface RewardBasedVideoAdNetworkAdapter { + // @required +(NSString *)adapterVersion; + [Static] + [Export ("adapterVersion")] + string AdapterVersion { get; } + + // @required +(Class)networkExtrasClass; + [Static] + [Export ("networkExtrasClass")] + AdNetworkExtras NetworkExtrasClass { get; } + + // @required -(instancetype)initWithRewardBasedVideoAdNetworkConnector:(id)connector; + [Export ("initWithRewardBasedVideoAdNetworkConnector:")] + IntPtr Constructor (RewardBasedVideoAdNetworkConnector connector); + + // @required -(void)setUp; + [Export ("setUp")] + void SetUp (); + + // @required -(void)requestRewardBasedVideoAd; + [Export ("requestRewardBasedVideoAd")] + void RequestRewardBasedVideoAd (); + + // @required -(void)presentRewardBasedVideoAdWithRootViewController:(UIViewController *)viewController; + [Export ("presentRewardBasedVideoAdWithRootViewController:")] + void PresentRewardBasedVideoAdWithRootViewController (UIViewController viewController); + + // @required -(void)stopBeingDelegate; + [Export ("stopBeingDelegate")] + void StopBeingDelegate (); + + // @optional -(instancetype)initWithRewardBasedVideoAdNetworkConnector:(id)connector credentials:(NSArray *)credentials; + [Export ("initWithRewardBasedVideoAdNetworkConnector:credentials:")] + IntPtr Constructor (RewardBasedVideoAdNetworkConnector connector, NSDictionary [] credentials); + } + + // @protocol GADMRewardBasedVideoAdNetworkConnector + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADMRewardBasedVideoAdNetworkConnector")] + interface RewardBasedVideoAdNetworkConnector : MediationAdRequest { + // @required -(void)adapterDidSetUpRewardBasedVideoAd:(id)rewardBasedVideoAdAdapter; + [Abstract] + [Export ("adapterDidSetUpRewardBasedVideoAd:")] + void AdapterDidSetUpRewardBasedVideoAd (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); + + // @required -(void)adapter:(id)rewardBasedVideoAdAdapter didFailToSetUpRewardBasedVideoAdWithError:(NSError *)error; + [Abstract] + [Export ("adapter:didFailToSetUpRewardBasedVideoAdWithError:")] + void Adapter (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter, NSError error); + + // @required -(void)adapterDidGetAdClick:(id)adapter; + [Abstract] + [Export ("adapterDidGetAdClick:")] + void AdapterDidGetAdClick (RewardBasedVideoAdNetworkAdapter adapter); + + // @required -(void)adapterDidReceiveRewardBasedVideoAd:(id)rewardBasedVideoAdAdapter; + [Abstract] + [Export ("adapterDidReceiveRewardBasedVideoAd:")] + void AdapterDidReceiveRewardBasedVideoAd (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); + + // @required -(void)adapterDidOpenRewardBasedVideoAd:(id)rewardBasedVideoAdAdapter; + [Abstract] + [Export ("adapterDidOpenRewardBasedVideoAd:")] + void AdapterDidOpenRewardBasedVideoAd (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); + + // @required -(void)adapterDidStartPlayingRewardBasedVideoAd:(id)rewardBasedVideoAdAdapter; + [Abstract] + [Export ("adapterDidStartPlayingRewardBasedVideoAd:")] + void AdapterDidStartPlayingRewardBasedVideoAd (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); + + // @required -(void)adapterDidCompletePlayingRewardBasedVideoAd:(id)rewardBasedVideoAdAdapter; + [Abstract] + [Export ("adapterDidCompletePlayingRewardBasedVideoAd:")] + void AdapterDidCompletePlayingRewardBasedVideoAd (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); + + // @required -(void)adapterDidCloseRewardBasedVideoAd:(id)rewardBasedVideoAdAdapter; + [Abstract] + [Export ("adapterDidCloseRewardBasedVideoAd:")] + void AdapterDidCloseRewardBasedVideoAd (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter); + + // @required -(void)adapter:(id)rewardBasedVideoAd didRewardUserWithReward:(GADAdReward *)reward; + [Abstract] + [Export ("adapter:didRewardUserWithReward:")] + void AdapterDidRewardUserWithReward (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAd, AdReward reward); + + // @required -(void)adapter:(id)rewardBasedVideoAdAdapter didFailToLoadRewardBasedVideoAdwithError:(NSError *)error; + [Abstract] + [Export ("adapter:didFailToLoadRewardBasedVideoAdwithError:")] + void AdapterDidFailToLoadRewardBasedVideoAdwithError (RewardBasedVideoAdNetworkAdapter rewardBasedVideoAdAdapter, NSError error); + } +} + +namespace Google.MobileAds.Mediation.Rtb { + + // @interface GADRTBMediationSignalsConfiguration : NSObject + [BaseType (typeof (NSObject), Name = "GADRTBMediationSignalsConfiguration")] + interface MediationSignalsConfiguration { + // @property (readonly, nonatomic) NSArray * _Nonnull credentials; + [Export ("credentials")] + MediationCredentials [] Credentials { get; } + } + + // @interface GADRTBRequestParameters : NSObject + [BaseType (typeof (NSObject), Name = "GADRTBRequestParameters")] + interface RequestParameters { + // @property (readonly, nonatomic) GADRTBMediationSignalsConfiguration * _Nonnull configuration; + [Export ("configuration")] + MediationSignalsConfiguration Configuration { get; } + + // @property (readonly, nonatomic) id _Nullable extras; + [NullAllowed, Export ("extras")] + AdNetworkExtras Extras { get; } + + // @property (readonly, nonatomic) GADAdSize adSize; + [Export ("adSize")] + AdSize AdSize { get; } + } + + // typedef void (^GADRTBSignalCompletionHandler)(NSString * _Nullable, NSError * _Nullable); + delegate void SignalCompletionHandler ([NullAllowed] string signals, [NullAllowed] NSError error); + + // @protocol GADRTBAdapter + [Model (AutoGeneratedName = true)] + [Protocol] + [BaseType (typeof (NSObject), Name = "GADRTBRequestParameters")] + interface Adapter : Google.MobileAds.Mediation.MediationAdapter { + // @required -(void)collectSignalsForRequestParameters:(GADRTBRequestParameters * _Nonnull)params completionHandler:(GADRTBSignalCompletionHandler _Nonnull)completionHandler; + [Abstract] + [Export ("collectSignalsForRequestParameters:completionHandler:")] + void CollectSignalsForRequestParameters (RequestParameters requestParams, SignalCompletionHandler completionHandler); + } } diff --git a/source/Google/MobileAds/Enums.cs b/source/Google/MobileAds/Enums.cs index 8f525ea8c..24343b409 100644 --- a/source/Google/MobileAds/Enums.cs +++ b/source/Google/MobileAds/Enums.cs @@ -5,11 +5,9 @@ using Foundation; using ObjCRuntime; -namespace Google.MobileAds -{ +namespace Google.MobileAds { [Native] - public enum AdFormat : long - { + public enum AdFormat : long { Banner, Interstitial, Rewarded, @@ -18,8 +16,7 @@ public enum AdFormat : long Unknown } - public enum AdLoaderAdType - { + public enum AdLoaderAdType { // extern NSString *const GADAdLoaderAdTypeCustomNative; [Field ("GADAdLoaderAdTypeCustomNative", "__Internal")] CustomNative, @@ -34,8 +31,7 @@ public enum AdLoaderAdType } [Native] - public enum AdValuePrecision : long - { + public enum AdValuePrecision : long { Unknown = 0, Estimated = 1, PublisherProvided = 2, @@ -43,8 +39,7 @@ public enum AdValuePrecision : long } [Native] - public enum PresentationErrorCode : long - { + public enum PresentationErrorCode : long { AdNotReady = 15, AdTooLarge = 16, Internal = 17, @@ -53,8 +48,7 @@ public enum PresentationErrorCode : long //GADRequest file [Native] - public enum Gender : long - { + public enum Gender : long { Unknown, Male, Female @@ -62,8 +56,7 @@ public enum Gender : long //GADRequestError file [Native] - public enum ErrorCode : long - { + public enum ErrorCode : long { InvalidRequest = 0, NoFill = 1, NetworkError = 2, @@ -97,19 +90,30 @@ public enum AdapterInitializationState : long { } [Native] - public enum NativeAdImageAdLoaderOptionsOrientation : long - { + public enum NativeAdImageAdLoaderOptionsOrientation : long { Any = 1, Portrait = 2, Landscape = 3 } [Native] - public enum AdChoicesPosition : long - { + public enum AdChoicesPosition : long { TopRightCorner, TopLeftCorner, BottomRightCorner, BottomLeftCorner } + + [Native] + public enum BannerAnimationType : long { + None = 0, + FlipFromLeft = 1, + FlipFromRight = 2, + CurlUp = 3, + CurlDown = 4, + SlideFromLeft = 5, + SlideFromRight = 6, + FadeIn = 7, + Random = 8 + } } diff --git a/source/Google/MobileAds/Extensions.cs b/source/Google/MobileAds/Extensions.cs index e76f7c13c..de907d172 100644 --- a/source/Google/MobileAds/Extensions.cs +++ b/source/Google/MobileAds/Extensions.cs @@ -91,6 +91,10 @@ public partial class AdSizeCons { [DllImport ("__Internal", EntryPoint = "GADAdSizeIsFluid")] public static extern bool AdSizeIsFluid (AdSize size); + // extern GADAdSize GADClosestValidSizeForAdSizes (GADAdSize original, NSArray * _Nonnull possibleAdSizes); + [DllImport ("__Internal", EntryPoint = "GADClosestValidSizeForAdSizes")] + static extern AdSize ClosestValidSizeForAdSizes (AdSize original, NSValue [] possibleAdSizes); + // NSString *NSStringFromGADAdSize(GADAdSize size); [DllImport ("__Internal", EntryPoint = "NSStringFromGADAdSize")] static extern IntPtr _GetNSString (AdSize size); diff --git a/source/Google/MobileAds/MobileAds.csproj b/source/Google/MobileAds/MobileAds.csproj index a9d86d922..c664a909e 100644 --- a/source/Google/MobileAds/MobileAds.csproj +++ b/source/Google/MobileAds/MobileAds.csproj @@ -6,7 +6,7 @@ Google.MobileAds Google.MobileAds 1.0.0.0 - 8.13.0.0 + 9.5.0.0 Resources true true @@ -24,7 +24,7 @@ https://go.microsoft.com/fwlink/?linkid=865562 License.md true - 8.13.0.0 + 9.5.0.0 diff --git a/source/Google/MobileAds/MobileAds.targets b/source/Google/MobileAds/MobileAds.targets index 95782c149..79740dcd8 100644 --- a/source/Google/MobileAds/MobileAds.targets +++ b/source/Google/MobileAds/MobileAds.targets @@ -2,19 +2,19 @@ <_GoogleMobileAdsAssemblyName>Google.MobileAds, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - <_GoogleMobileAdsId>FAdM-8.13.0 - <_GoogleMobileAdsSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleMobileAdsId)\Frameworks\GoogleMobileAdsFramework-Current\ + <_GoogleMobileAdsId>FAdM-9.5.0 + <_GoogleMobileAdsSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleMobileAdsId)\Frameworks\GoogleMobileAdsFramework-Current\ - https://dl.google.com/dl/cpdc/7a51a535dad39fe5/Google-Mobile-Ads-SDK-8.13.0.tar.gz + https://dl.google.com/dl/cpdc/dfd4924852b388c2/Google-Mobile-Ads-SDK-9.5.0.tar.gz Tgz - + - + Framework @@ -25,7 +25,7 @@ Here's a workaround to include the missing metada meanwhile the fix hit stable --> - + <_FrameworkNativeReference Update="@(_FrameworkNativeReference)" Condition="'%(_FrameworkNativeReference.Filename)' == 'GoogleMobileAds'"> True True diff --git a/source/Google/MobileAds/Structs.cs b/source/Google/MobileAds/Structs.cs index ba55ffc79..8a9ee4f2d 100644 --- a/source/Google/MobileAds/Structs.cs +++ b/source/Google/MobileAds/Structs.cs @@ -4,12 +4,17 @@ using ObjCRuntime; using CoreGraphics; -namespace Google.MobileAds -{ +namespace Google.MobileAds { [StructLayout (LayoutKind.Sequential)] - public struct AdSize - { + public struct AdSize { public CGSize Size; public uint Flags; } + + [StructLayout (LayoutKind.Sequential)] + public struct VersionNumber { + public nint MajorVersion; + public nint MinorVersion; + public nint PatchVersion; + } } diff --git a/source/Google/Places/ApiDefinition.cs b/source/Google/Places/ApiDefinition.cs index cacfcfd17..4fffb55a3 100644 --- a/source/Google/Places/ApiDefinition.cs +++ b/source/Google/Places/ApiDefinition.cs @@ -103,7 +103,7 @@ interface AutocompleteFilter { // @property (nonatomic) id _Nullable locationRestriction; [NullAllowed] [Export ("locationRestriction", ArgumentSemantic.Assign)] - NSObject LocationRestriction { get; set; } + NSObject LocationRestriction { get; set; } } // @interface GMSAutocompleteMatchFragment : NSObject @@ -206,15 +206,6 @@ interface AutocompleteResultsViewController : IUISearchResultsUpdating { [Export ("delegate", ArgumentSemantic.Weak)] IAutocompleteResultsViewControllerDelegate Delegate { get; set; } - // @property(nonatomic, strong) GMSCoordinateBounds *autocompleteBounds; - [NullAllowed] - [Export ("autocompleteBounds", ArgumentSemantic.Strong)] - Google.Maps.CoordinateBounds AutocompleteBounds { get; set; } - - // @property (assign, nonatomic) GMSAutocompleteBoundsMode autocompleteBoundsMode; - [Export ("autocompleteBoundsMode", ArgumentSemantic.Assign)] - AutocompleteBoundsMode AutocompleteBoundsMode { get; set; } - // @property(nonatomic, strong) GMSAutocompleteFilter *autocompleteFilter; [NullAllowed] [Export ("autocompleteFilter", ArgumentSemantic.Strong)] @@ -541,10 +532,10 @@ interface Place { [Export ("attributions", ArgumentSemantic.Copy)] NSAttributedString Attributions { get; } - // @property(nonatomic, strong, readonly) GMSCoordinateBounds *viewport; + // @property(nonatomic, strong, readonly) GMSPlaceViewportInfo *viewport; [NullAllowed] [Export ("viewportInfo", ArgumentSemantic.Strong)] - PlaceViewportInfo Viewport { get; } + PlaceViewportInfo ViewportInfo { get; } // @property(nonatomic, copy, readonly) GMS_NSArrayOf(GMSAddressComponent *) *GMS_NULLABLE_PTR addressComponents; [NullAllowed] @@ -597,9 +588,8 @@ interface Place { } // @interface GMSPlaceViewportInfo : NSObject - [BaseType (typeof(NSObject), Name = "GMSPlaceViewportInfo")] - interface PlaceViewportInfo - { + [BaseType (typeof (NSObject), Name = "GMSPlaceViewportInfo")] + interface PlaceViewportInfo { // @property (readonly, nonatomic) CLLocationCoordinate2D northEast; [Export ("northEast")] CLLocationCoordinate2D NorthEast { get; } @@ -746,9 +736,9 @@ interface PlacesClient { [Export ("currentPlaceWithCallback:")] void CurrentPlace (PlaceLikelihoodListHandler callback); - // -(void)findAutocompletePredictionsFromQuery:(NSString * _Nonnull)query bounds:(GMSCoordinateBounds * _Nullable)bounds boundsMode:(GMSAutocompleteBoundsMode)boundsMode filter:(GMSAutocompleteFilter * _Nullable)filter sessionToken:(GMSAutocompleteSessionToken * _Nonnull)sessionToken callback:(GMSAutocompletePredictionsCallback _Nonnull)callback; - [Export ("findAutocompletePredictionsFromQuery:bounds:boundsMode:filter:sessionToken:callback:")] - void FindAutocompletePredictions (string query, [NullAllowed] CoordinateBounds bounds, AutocompleteBoundsMode boundsMode, [NullAllowed] AutocompleteFilter filter, [NullAllowed] AutocompleteSessionToken sessionToken, AutocompletePredictionsHandler callback); + // -(void)findAutocompletePredictionsFromQuery:(NSString * _Nonnull)query filter:(GMSAutocompleteFilter * _Nullable)filter sessionToken:(GMSAutocompleteSessionToken * _Nonnull)sessionToken callback:(GMSAutocompletePredictionsCallback _Nonnull)callback; + [Export ("findAutocompletePredictionsFromQuery:filter:sessionToken:callback:")] + void FindAutocompletePredictions (string query, [NullAllowed] AutocompleteFilter filter, [NullAllowed] AutocompleteSessionToken sessionToken, AutocompletePredictionsHandler callback); // -(void)fetchPlaceFromPlaceID:(NSString * _Nonnull)placeID placeFields:(GMSPlaceField)placeFields sessionToken:(GMSAutocompleteSessionToken * _Nullable)sessionToken callback:(GMSPlaceResultCallback _Nonnull)callback; [Export ("fetchPlaceFromPlaceID:placeFields:sessionToken:callback:")] diff --git a/source/Google/Places/Enums.cs b/source/Google/Places/Enums.cs index 38a79c86d..08fb40b70 100644 --- a/source/Google/Places/Enums.cs +++ b/source/Google/Places/Enums.cs @@ -4,12 +4,6 @@ using ObjCRuntime; namespace Google.Places { - [Native] - public enum AutocompleteBoundsMode : ulong { - Bias, - Restrict - } - [Native] public enum PlacesAutocompleteTypeFilter : long { NoFilter, diff --git a/source/MLKit/BarcodeScanning/BarcodeScanning.csproj b/source/MLKit/BarcodeScanning/BarcodeScanning.csproj index 6d50a0036..fe8e02181 100644 --- a/source/MLKit/BarcodeScanning/BarcodeScanning.csproj +++ b/source/MLKit/BarcodeScanning/BarcodeScanning.csproj @@ -6,7 +6,7 @@ MLKit.BarcodeScanning MLKit.BarcodeScanning 1.0.0.0 - 1.6.0 + 1.7.0 Resources true @@ -23,7 +23,7 @@ https://go.microsoft.com/fwlink/?linkid=2007321 License.md true - 1.6.0 + 1.7.0 diff --git a/source/MLKit/BarcodeScanning/BarcodeScanning.targets b/source/MLKit/BarcodeScanning/BarcodeScanning.targets index 1b01f136d..82c65c363 100644 --- a/source/MLKit/BarcodeScanning/BarcodeScanning.targets +++ b/source/MLKit/BarcodeScanning/BarcodeScanning.targets @@ -2,19 +2,19 @@ <_MLKitBarcodeAssemblyName>MLKit.BarcodeScanning, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - <_MLKitBarcodeItemsFolder>MLKBarcode-1.6.0 + <_MLKitBarcodeItemsFolder>MLKBarcode-1.7.0 <_MLKitBarcodeSDKBaseFolder>$(XamarinBuildDownloadDir)$(_MLKitBarcodeItemsFolder)\ - https://dl.google.com/dl/cpdc/91469daa8120529a/MLKitBarcodeScanning-1.6.0.tar.gz + https://dl.google.com/dl/cpdc/409fef8c5854abae/MLKitBarcodeScanning-1.7.0.tar.gz Tgz - + Framework True