6 files changed, 13 insertions, 13 deletions
diff --git a/app/build.gradle b/app/build.gradle
index fa8588b92..6687df7fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -193,8 +193,8 @@ dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.4-rc2'
-    testCompile 'org.robolectric:shadows-support-v4:3.4-rc2'
+    testCompile 'org.robolectric:robolectric:3.4.2'
+    testCompile 'org.robolectric:supportv4:3.4.2'
     testCompile 'org.mockito:mockito-core:1.9.5'
     testCompile 'com.github.menny:JUnitTestsGrouping:0.1.0'
     canaryCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
diff --git a/app/src/test/java/com/anysoftkeyboard/AnySoftKeyboardKeyboardPersistentLayoutTest.java b/app/src/test/java/com/anysoftkeyboard/AnySoftKeyboardKeyboardPersistentLayoutTest.java
index 0aa873477..1dc95b43c 100644
--- a/app/src/test/java/com/anysoftkeyboard/AnySoftKeyboardKeyboardPersistentLayoutTest.java
+++ b/app/src/test/java/com/anysoftkeyboard/AnySoftKeyboardKeyboardPersistentLayoutTest.java
@@ -226,7 +226,7 @@ public class AnySoftKeyboardKeyboardPersistentLayoutTest {
 
 
         mAnySoftKeyboardController = Robolectric.buildService(TestableAnySoftKeyboard.class);
-        mAnySoftKeyboardUnderTest = mAnySoftKeyboardController.attach().create().get();
+        mAnySoftKeyboardUnderTest = mAnySoftKeyboardController.create().get();
 
         mAnySoftKeyboardUnderTest.onCreateInputView();
 
@@ -253,7 +253,7 @@ public class AnySoftKeyboardKeyboardPersistentLayoutTest {
 
 
         mAnySoftKeyboardController = Robolectric.buildService(TestableAnySoftKeyboard.class);
-        mAnySoftKeyboardUnderTest = mAnySoftKeyboardController.attach().create().get();
+        mAnySoftKeyboardUnderTest = mAnySoftKeyboardController.create().get();
 
         mAnySoftKeyboardUnderTest.onCreateInputView();
 
diff --git a/app/src/test/java/com/anysoftkeyboard/RobolectricFragmentTestCase.java b/app/src/test/java/com/anysoftkeyboard/RobolectricFragmentTestCase.java
index 264067e74..883fea786 100644
--- a/app/src/test/java/com/anysoftkeyboard/RobolectricFragmentTestCase.java
+++ b/app/src/test/java/com/anysoftkeyboard/RobolectricFragmentTestCase.java
@@ -33,7 +33,7 @@ public abstract class RobolectricFragmentTestCase<T extends Fragment> {
     protected final T startFragmentWithState(@Nullable Bundle state) {
         T fragment = createFragment();
 
-        mFragmentController = SupportFragmentController.of(fragment, MainSettingsActivity.class).attach();
+        mFragmentController = SupportFragmentController.of(fragment, MainSettingsActivity.class);
 
         mFragmentController.create(R.id.main_ui_content, state);
         //if (state != null) mFragmentController.get().onViewStateRestored(state);
diff --git a/app/src/test/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysKeyboardPagerAdapterTest.java b/app/src/test/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysKeyboardPagerAdapterTest.java
index a06a13ae6..fe1056d68 100644
--- a/app/src/test/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysKeyboardPagerAdapterTest.java
+++ b/app/src/test/java/com/anysoftkeyboard/quicktextkeys/ui/QuickKeysKeyboardPagerAdapterTest.java
@@ -23,7 +23,7 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
-import org.robolectric.internal.ShadowExtractor;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowView;
 
 import java.util.List;
@@ -66,13 +66,13 @@ public class QuickKeysKeyboardPagerAdapterTest {
         Assert.assertEquals(1, container.getChildCount());
         Assert.assertSame(instance0, container.getChildAt(0));
 
-        final QuickKeysKeyboardView keyboardView0 = (QuickKeysKeyboardView) ((View) instance0).findViewById(R.id.keys_container);
+        final QuickKeysKeyboardView keyboardView0 = ((View) instance0).findViewById(R.id.keys_container);
         Assert.assertNotNull(keyboardView0);
 
         Object instance1 = mUnderTest.instantiateItem(container, 1);
         Assert.assertNotNull(instance1);
         Assert.assertNotSame(instance0, instance1);
-        final QuickKeysKeyboardView keyboardView1 = (QuickKeysKeyboardView) ((View) instance1).findViewById(R.id.keys_container);
+        final QuickKeysKeyboardView keyboardView1 = ((View) instance1).findViewById(R.id.keys_container);
         Assert.assertNotNull(keyboardView1);
 
         Assert.assertNotEquals(keyboardView0.getKeyboard().getKeyboardAddOn().getId(), keyboardView1.getKeyboard().getKeyboardAddOn().getId());
@@ -80,7 +80,7 @@ public class QuickKeysKeyboardPagerAdapterTest {
         Object instance0Again = mUnderTest.instantiateItem(container, 0);
         Assert.assertNotNull(instance0Again);
         Assert.assertNotSame(instance0, instance0Again);
-        final QuickKeysKeyboardView keyboardView0Again = (QuickKeysKeyboardView) ((View) instance0Again).findViewById(R.id.keys_container);
+        final QuickKeysKeyboardView keyboardView0Again = ((View) instance0Again).findViewById(R.id.keys_container);
         Assert.assertNotNull(keyboardView0Again);
         Assert.assertSame(keyboardView0.getKeyboard(), keyboardView0Again.getKeyboard());
         //making sure the keyboard DOES NOT have a background - this is because we want the background to be used in the pager container.
@@ -93,9 +93,9 @@ public class QuickKeysKeyboardPagerAdapterTest {
     public void testPopupListenerDisable() throws Exception {
         ViewGroup container = new LinearLayout(RuntimeEnvironment.application);
         Object instance0 = mUnderTest.instantiateItem(container, 0);
-        final QuickKeysKeyboardView keyboardView0 = (QuickKeysKeyboardView) ((View) instance0).findViewById(R.id.keys_container);
+        final QuickKeysKeyboardView keyboardView0 = ((View) instance0).findViewById(R.id.keys_container);
 
-        ShadowAnyKeyboardViewWithMiniKeyboard shadow = (ShadowAnyKeyboardViewWithMiniKeyboard) ShadowExtractor.extract(keyboardView0);
+        ShadowAnyKeyboardViewWithMiniKeyboard shadow = Shadow.extract(keyboardView0);
         Assert.assertNotNull(shadow.mPopupShownListener);
 
         Mockito.verify(mViewPager, Mockito.never()).setEnabled(Mockito.anyBoolean());
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 527e43f75..80321d5d2 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b259ea5e7..90ad5d52a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 15 16:30:13 EDT 2017
+#Mon Aug 21 22:37:26 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip