From ba1332d1b4dd525a2ef313246482708cb2016052 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 6 Dec 2017 12:55:23 -0800 Subject: Changes needed to upgrade to new gradle version - Add ignore for various lint errors that is introduced in the lint update - Remove GLIF Pixel themes as they are unused and causing lint errors - Add flavor dimension "compat" as it is now required - Replace *Compile with *Implementation in the gradle files, as needed by the newer Gradle version - Use build tools 27.0.0 to avoid the Gradle warning - Use new Robolectric configuration mechanism and removed our old hack, per http://robolectric.org/getting-started/ Reference: https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html Test: Existing tests pass Bug: 70287447 Change-Id: I505476ae3695cd06349766c5e6280299f779f272 --- .../src/com/android/setupwizardlib/view/NavigationBarButton.java | 2 ++ .../src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java | 3 +-- .../robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java | 3 +-- .../src/com/android/setupwizardlib/util/DimensionConsistencyTest.java | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'library/gingerbread') diff --git a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java index 5172c47..d7a3c2e 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java +++ b/library/gingerbread/src/com/android/setupwizardlib/view/NavigationBarButton.java @@ -16,6 +16,7 @@ package com.android.setupwizardlib.view; +import android.annotation.SuppressLint; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.PorterDuff; @@ -30,6 +31,7 @@ import android.widget.Button; * Button for navigation bar, which includes tinting of its compound drawables to be used for dark * and light themes. */ +@SuppressLint("AppCompatCustomView") public class NavigationBarButton extends Button { public NavigationBarButton(Context context) { diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java index 4fb3e28..3020ed3 100644 --- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java +++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/ExpandableSwitchItemTest.java @@ -32,7 +32,6 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.R; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; @@ -44,7 +43,7 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; @RunWith(SuwLibRobolectricTestRunner.class) -@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) +@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) public class ExpandableSwitchItemTest { private TextView mSummaryView; diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java index d391d80..fa5bbba 100644 --- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java +++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/items/SwitchItemTest.java @@ -31,7 +31,6 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.R; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; @@ -40,7 +39,7 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @RunWith(SuwLibRobolectricTestRunner.class) -@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) +@Config(sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) public class SwitchItemTest { private SwitchCompat mSwitch; diff --git a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java index 43e7f03..7a08235 100644 --- a/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java +++ b/library/gingerbread/test/robotest/src/com/android/setupwizardlib/util/DimensionConsistencyTest.java @@ -25,7 +25,6 @@ import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.ContextThemeWrapper; -import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.R; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; @@ -35,7 +34,7 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; @RunWith(SuwLibRobolectricTestRunner.class) -@Config(constants = BuildConfig.class, sdk = Config.ALL_SDKS) +@Config(sdk = Config.ALL_SDKS) public class DimensionConsistencyTest { // Visual height of the framework switch widget -- cgit v1.2.3