From f6d34b8a0c43d1234bd27b81278b844c53cbb28e Mon Sep 17 00:00:00 2001
From: Uldis Zeidurs <uldis.zeidurs@gmail.com>
Date: Thu, 29 Jun 2017 16:18:06 +0300
Subject: [PATCH] fixing issues that block the project from building on Fuse
 >1.*

---
 Google.Analytics/Google.Analytics.uno     | 8 ++++----
 Google.Analytics/Google.Analytics.unoproj | 1 -
 Google.Analytics/JS.uno                   | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Google.Analytics/Google.Analytics.uno b/Google.Analytics/Google.Analytics.uno
index 6afa48c..317e9b0 100644
--- a/Google.Analytics/Google.Analytics.uno
+++ b/Google.Analytics/Google.Analytics.uno
@@ -8,7 +8,7 @@ using Fuse.Controls;
 using Fuse.Controls.Native;
 using Fuse.Controls.Native.Android;
 using Uno.Threading;
-using Uno.Platform2;
+using Uno.Platform;
 
 namespace Google.Analytics
 {
@@ -19,7 +19,7 @@ namespace Google.Analytics
     {
         [Foreign(Language.ObjC)]
         extern(iOS)
-        public void StartService(ApplicationState state)
+        public void StartService(Fuse.Platform.ApplicationState state)
         @{
             NSError *configureError;
             [[GGLContext sharedInstance] configureWithError:&configureError];
@@ -75,7 +75,7 @@ namespace Google.Analytics
         extern(Android) Java.Object _defaultTracker;
 
         extern(Android)
-        public void StartService(ApplicationState state)
+        public void StartService(Fuse.Platform.ApplicationState state)
         {
             _defaultTracker = createDefaultTracker();
         }
@@ -185,7 +185,7 @@ namespace Google.Analytics
     extern(!mobile)
     internal class AnalyticsService
     {
-        public void StartService(ApplicationState state) {
+        public void StartService(Fuse.Platform.ApplicationState state) {
             debug_log("Google Analytics not supported in this platform.");
         }
         public void ScreenView(string page) {
diff --git a/Google.Analytics/Google.Analytics.unoproj b/Google.Analytics/Google.Analytics.unoproj
index 0b9f0ae..a03b841 100644
--- a/Google.Analytics/Google.Analytics.unoproj
+++ b/Google.Analytics/Google.Analytics.unoproj
@@ -2,7 +2,6 @@
   "Packages": [
   	"Fuse",
   	"FuseJS",
-    "FuseCore",
     "Fuse.Scripting"
   ],
   "Includes": [
diff --git a/Google.Analytics/JS.uno b/Google.Analytics/JS.uno
index aca3cd2..68ae242 100644
--- a/Google.Analytics/JS.uno
+++ b/Google.Analytics/JS.uno
@@ -23,14 +23,14 @@ namespace Google.Analytics.JS
         {
             if(_instance != null) return;
 
-            Resource.SetGlobalKey(_instance = this, "Google/Analytics");
+            Uno.UX.Resource.SetGlobalKey(_instance = this, "Google/Analytics");
 
             AddMember(new NativeFunction("ScreenView", ScreenView));
             AddMember(new NativeFunction("TrackEvent", TrackEvent));
 
             _analyticsService = new AnalyticsService();
 
-            Uno.Platform2.Application.Started += _analyticsService.StartService;
+            Fuse.Platform.Lifecycle.Started += _analyticsService.StartService;
 
             debug_log("Analytics Module Initialized");
         }