release-request-f893cb5a-c29a-4ec6-b9d6-afd819c04a00-for-git_studio-3.0-release-4261210 snap-temp-L39900000092108210
Change-Id: I74247de4a5512870c6495f7a3846401f75f419d8
diff --git a/BUILD b/BUILD
index ff493d7..7bcadc8 100644
--- a/BUILD
+++ b/BUILD
@@ -3,6 +3,8 @@
iml_module(
name = "google-services",
srcs = ["src"],
+ bundle_data = glob(["lib/licenses/**"]),
+ iml_files = ["google-services.iml"],
resources = ["resources"],
tags = ["managed"],
visibility = ["//visibility:public"],
diff --git a/src/com/google/services/GoogleServiceLoginListener.java b/src/com/google/services/GoogleServiceLoginListener.java
index 817560a..0395e34 100644
--- a/src/com/google/services/GoogleServiceLoginListener.java
+++ b/src/com/google/services/GoogleServiceLoginListener.java
@@ -15,8 +15,8 @@
*/
package com.google.services;
-import com.android.tools.idea.ui.properties.core.BoolValueProperty;
-import com.android.tools.idea.ui.properties.core.ObservableBool;
+import com.android.tools.idea.observable.core.BoolValueProperty;
+import com.android.tools.idea.observable.core.ObservableBool;
import com.google.gct.login.GoogleLogin;
import com.google.gct.login.GoogleLoginListener;
import com.intellij.openapi.extensions.Extensions;
diff --git a/src/com/google/services/creators/GoogleServiceCreator.java b/src/com/google/services/creators/GoogleServiceCreator.java
index e664248..b725b9f 100644
--- a/src/com/google/services/creators/GoogleServiceCreator.java
+++ b/src/com/google/services/creators/GoogleServiceCreator.java
@@ -17,14 +17,14 @@
import com.android.tools.idea.structure.services.DeveloperServiceCreator;
import com.android.tools.idea.structure.services.ServiceContext;
-import com.android.tools.idea.ui.properties.core.ObservableBool;
-import com.android.tools.idea.ui.properties.core.StringValueProperty;
+import com.android.tools.idea.observable.core.ObservableBool;
+import com.android.tools.idea.observable.core.StringValueProperty;
import com.google.gct.login.GoogleLogin;
import com.google.gct.login.InvalidThreadTypeException;
import com.google.services.GoogleServiceLoginListener;
import org.jetbrains.annotations.NotNull;
-import static com.android.tools.idea.ui.properties.expressions.bool.BooleanExpressions.not;
+import static com.android.tools.idea.observable.expressions.bool.BooleanExpressions.not;
/**
* Base class for any developer service creator that relies on some additional Google specific
