From 46216d0e61318e7af168e9e903ef8d943bb49b2e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 13 Dec 2017 02:48:52 +0000 Subject: Revert "Changes needed to upgrade to new gradle version" This reverts commit ba1332d1b4dd525a2ef313246482708cb2016052. Reason for revert: Broke taimen builds in master Change-Id: Iffffadbacae8c6c69907dcecc447f958cf6ce909 --- .../setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java') diff --git a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java index 429445c..f77e256 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java +++ b/library/test/robotest/src/com/android/setupwizardlib/template/ScrollViewScrollHandlingDelegateTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application; +import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; import com.android.setupwizardlib.view.BottomScrollView; import com.android.setupwizardlib.view.BottomScrollView.BottomScrollListener; @@ -35,7 +36,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; -@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) +@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) @RunWith(SuwLibRobolectricTestRunner.class) public class ScrollViewScrollHandlingDelegateTest { -- cgit v1.2.3