Fixing gradle and some tests
Change-Id: Ied44ab475a30058f19387e843ce113b3028c1bd5
diff --git a/build.gradle b/build.gradle
index 44f5b7c..b9a990f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:+'
+ classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.0'
}
}
@@ -51,13 +51,13 @@
}
dependencies {
- compile 'com.android.support:support-v4:23.0.1'
- compile 'com.android.support:recyclerview-v7:23.0.1'
+ compile 'com.android.support:support-v4:23.1.1'
+ compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2'
testCompile 'junit:junit:4.12'
- androidTestCompile 'com.android.support.test:runner:+'
- androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:+'
+ androidTestCompile 'com.android.support.test:runner:0.5'
+ androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
}
protobuf {
diff --git a/tests/src/com/android/launcher3/util/TestLauncherProvider.java b/tests/src/com/android/launcher3/util/TestLauncherProvider.java
index aef3240..8758f55 100644
--- a/tests/src/com/android/launcher3/util/TestLauncherProvider.java
+++ b/tests/src/com/android/launcher3/util/TestLauncherProvider.java
@@ -2,6 +2,7 @@
import android.content.Context;
+import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherProvider;
/**
@@ -17,7 +18,7 @@
@Override
protected synchronized void createDbIfNotExists() {
if (mOpenHelper == null) {
- mOpenHelper = new MyDatabaseHelper(getContext(), this);
+ mOpenHelper = new MyDatabaseHelper(getContext());
}
}
@@ -25,8 +26,8 @@
protected void notifyListeners() { }
private static class MyDatabaseHelper extends DatabaseHelper {
- public MyDatabaseHelper(Context context, LauncherProvider provider) {
- super(context, provider, null);
+ public MyDatabaseHelper(Context context) {
+ super(context, null);
}
@Override