Skip to content

Commit 149c3f6

Browse files
author
SotoiGhost
committed
Fixed samples
1 parent c247c70 commit 149c3f6

File tree

13 files changed

+27
-12
lines changed

13 files changed

+27
-12
lines changed

Diff for: ‎components.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void SetArtifactsDependencies ()
8080
FIREBASE_DYNAMIC_LINKS_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT };
8181
FIREBASE_INSTALLATIONS_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT };
8282
FIREBASE_INSTANCE_ID_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTALLATIONS_ARTIFACT };
83-
FIREBASE_MLKIT_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTALLATIONS_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT, FIREBASE_AB_TESTING_ARTIFACT, FIREBASE_REMOTE_CONFIG_ARTIFACT, FIREBASE_MLKIT_COMMON_ARTIFACT,FIREBASE_MLKIT_MODEL_INTERPRETER_ARTIFACT, FIREBASE_MLKIT_NATURAL_LANGUAGE_ARTIFACT, FIREBASE_MLKIT_VISION_ARTIFACT };
83+
FIREBASE_MLKIT_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTALLATIONS_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT, FIREBASE_AB_TESTING_ARTIFACT, FIREBASE_REMOTE_CONFIG_ARTIFACT, FIREBASE_MLKIT_COMMON_ARTIFACT, FIREBASE_MLKIT_MODEL_INTERPRETER_ARTIFACT, FIREBASE_MLKIT_NATURAL_LANGUAGE_ARTIFACT, FIREBASE_MLKIT_VISION_ARTIFACT };
8484
FIREBASE_MLKIT_COMMON_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTALLATIONS_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT };
8585
FIREBASE_MLKIT_MODEL_INTERPRETER_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTALLATIONS_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT, FIREBASE_MLKIT_COMMON_ARTIFACT };
8686
FIREBASE_MLKIT_NATURAL_LANGUAGE_ARTIFACT.Dependencies = new [] { FIREBASE_CORE_ARTIFACT, FIREBASE_INSTALLATIONS_ARTIFACT, FIREBASE_INSTANCE_ID_ARTIFACT, FIREBASE_MLKIT_COMMON_ARTIFACT, FIREBASE_AB_TESTING_ARTIFACT, FIREBASE_REMOTE_CONFIG_ARTIFACT };

Diff for: ‎samples/Firebase/MLKit.ModelInterpreter/ModelInterpreterSample/AppDelegate.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public override bool FinishedLaunching (UIApplication application, NSDictionary
1818
// Override point for customization after application launch.
1919
// If not required for your application you can safely delete this method
2020

21-
var t = typeof (Firebase.MLKit.ModelInterpreter.ModelInterpreter);
22-
var t2 = Firebase.Core.Configuration.SharedInstance;
23-
var t3 = Firebase.InstanceID.InstanceId.SharedInstance;
21+
var instanceId = Firebase.InstanceID.InstanceId.SharedInstance;
22+
var installations = Firebase.Installations.Installations.DefaultInstance;
23+
var modelInterpreter = new Firebase.MLKit.ModelInterpreter.CustomRemoteModel ("Dummy");
2424

2525
return true;
2626
}

Diff for: ‎samples/Firebase/MLKit.NaturalLanguage/NaturalLanguageSample/AppDelegate.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ public bool FinishedLaunching (UIApplication application, NSDictionary launchOpt
1616
// Override point for customization after application launch.
1717
// If not required for your application you can safely delete this method
1818
Firebase.Core.App.Configure ();
19-
var t = typeof (Firebase.MLKit.NaturalLanguage.NaturalLanguageApi);
19+
20+
var instanceId = Firebase.InstanceID.InstanceId.SharedInstance;
21+
var remoteConfig = Firebase.RemoteConfig.RemoteConfig.SharedInstance;
22+
var installations = Firebase.Installations.Installations.DefaultInstance;
23+
var abTesting = Firebase.ABTesting.ExperimentController.SharedInstance;
24+
var naturalLanguage = Firebase.MLKit.NaturalLanguage.NaturalLanguageApi.DefaultInstance;
2025

2126
return true;
2227
}

Diff for: ‎samples/Firebase/MLKit/MLKitSample/AppDelegate.cs

+7-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ public bool FinishedLaunching (UIApplication application, NSDictionary launchOpt
1717
// If not required for your application you can safely delete this method
1818
Firebase.Core.App.Configure ();
1919

20-
var t = typeof (Firebase.MLKit.Common.LocalModel);
21-
var t2 = typeof (Firebase.MLKit.ModelInterpreter.CustomLocalModel);
22-
var t3 = typeof (Firebase.MLKit.NaturalLanguage.NaturalLanguageApi);
23-
var t4 = typeof (Firebase.MLKit.Vision.VisionApi);
20+
var instanceId = Firebase.InstanceID.InstanceId.SharedInstance;
21+
var remoteConfig = Firebase.RemoteConfig.RemoteConfig.SharedInstance;
22+
var installations = Firebase.Installations.Installations.DefaultInstance;
23+
var abTesting = Firebase.ABTesting.ExperimentController.SharedInstance;
24+
var common = new Firebase.MLKit.ModelInterpreter.CustomRemoteModel ("Dummy");
25+
var naturalLanguage = Firebase.MLKit.NaturalLanguage.NaturalLanguageApi.DefaultInstance;
26+
var vision = Firebase.MLKit.Vision.VisionApi.Create ();
2427

2528
return true;
2629
}

Diff for: ‎source/Firebase/InstanceID/Loader.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class Loader
66
static Loader ()
77
{
88
Firebase.Core.Loader.ForceLoad ();
9+
Firebase.Installations.Loader.ForceLoad();
910
}
1011

1112
public static void ForceLoad () { }

Diff for: ‎source/Firebase/MLKit.Common/Loader.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class Loader
66
static Loader ()
77
{
88
Firebase.Core.Loader.ForceLoad ();
9+
Firebase.Installations.Loader.ForceLoad();
910
Firebase.InstanceID.Loader.ForceLoad ();
1011
}
1112

Diff for: ‎source/Firebase/MLKit.Common/MLKit.Common.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<_FirebaseMLKitCommonAssemblyName>Firebase.MLKit.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</_FirebaseMLKitCommonAssemblyName>

Diff for: ‎source/Firebase/MLKit.ModelInterpreter/Loader.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class Loader
66
static Loader ()
77
{
88
Firebase.Core.Loader.ForceLoad ();
9+
Firebase.Installations.Loader.ForceLoad();
910
Firebase.InstanceID.Loader.ForceLoad ();
1011
Firebase.MLKit.Common.Loader.ForceLoad ();
1112
}

Diff for: ‎source/Firebase/MLKit.NaturalLanguage/Loader.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class Loader
66
static Loader ()
77
{
88
Firebase.Core.Loader.ForceLoad ();
9+
Firebase.Installations.Loader.ForceLoad();
910
Firebase.InstanceID.Loader.ForceLoad ();
1011
Firebase.ABTesting.Loader.ForceLoad ();
1112
Firebase.RemoteConfig.Loader.ForceLoad ();

Diff for: ‎source/Firebase/MLKit.NaturalLanguage/MLKit.NaturalLanguage.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
<Url>https://dl.google.com/dl/cpdc/b09b22f0bb7acf83/FirebaseMLNLTranslate-0.17.0.tar.gz</Url>
3030
<Kind>Tgz</Kind>
3131
</XamarinBuildDownload>
32-
<XamarinBuildRestoreResources Include="_FirebaseMLKitNaturalLanguageItems"/>
32+
<XamarinBuildRestoreResources Include="_FMLNtrlLDownloadedItems"/>
3333
</ItemGroup>
3434

35-
<Target Name="_FirebaseMLKitNaturalLanguageItems">
35+
<Target Name="_FMLNtrlLDownloadedItems">
3636
<ItemGroup>
3737
<!-- From https://dl.google.com/dl/cpdc/7dc8c16825e1eafb/FirebaseMLNaturalLanguage-0.17.0.tar.gz -->
3838
<NativeReference Include="$(_FirebaseMLNaturalLanguageSDKBaseFolder)FirebaseMLNaturalLanguage.framework">

Diff for: ‎source/Firebase/MLKit.Vision/Loader.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class Loader
66
static Loader ()
77
{
88
Firebase.Core.Loader.ForceLoad ();
9+
Firebase.Installations.Loader.ForceLoad();
910
Firebase.InstanceID.Loader.ForceLoad ();
1011
Firebase.MLKit.Common.Loader.ForceLoad ();
1112
}

Diff for: ‎source/Firebase/PerformanceMonitoring/Loader.cs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public class Loader
77
static Loader ()
88
{
99
Firebase.Core.Loader.ForceLoad ();
10+
Firebase.Installations.Loader.ForceLoad();
1011
Firebase.InstanceID.Loader.ForceLoad ();
1112
Firebase.ABTesting.Loader.ForceLoad ();
1213
Firebase.RemoteConfig.Loader.ForceLoad ();

Diff for: ‎source/Firebase/RemoteConfig/Loader.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class Loader
66
static Loader ()
77
{
88
Firebase.Core.Loader.ForceLoad ();
9+
Firebase.Installations.Loader.ForceLoad();
910
Firebase.InstanceID.Loader.ForceLoad ();
1011
Firebase.ABTesting.Loader.ForceLoad ();
1112
}

0 commit comments

Comments
 (0)