jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341346 )
Change subject: [Dev] Upgrade Gradle Plugin to 2.3.0 ...................................................................... [Dev] Upgrade Gradle Plugin to 2.3.0 N.B. This requires dropping the android-apt plugin. It also required some minor code changes to fix new lint errors (in most cases, where a new annotation intends to prevent using a method with public accessibility but not intended for app dev use). All tests pass with this update. Release notes are available at https://developer.android.com/studio/releases/gradle-plugin.html Bug: T147099 Change-Id: Ie45aff43badbb448bf35651d26dfeffa22cb0b44 --- M app/build.gradle M app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java M app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java M app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java M app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java M app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java M app/src/main/java/org/wikipedia/views/AppTextView.java M app/src/main/java/org/wikipedia/views/AppTextViewWithImages.java M app/src/main/java/org/wikipedia/views/ConfigurableTextView.java M app/src/main/java/org/wikipedia/views/GoneIfEmptyTextView.java M build.gradle M scripts/apps-android-wikipedia-lint 14 files changed, 28 insertions(+), 51 deletions(-) Approvals: Niedzielski: Looks good to me, approved jenkins-bot: Verified diff --git a/app/build.gradle b/app/build.gradle index 5c262cc..c76619e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'com.neenbedankt.android-apt' import com.android.build.gradle.internal.dsl.ProductFlavor import com.android.ddmlib.DdmPreferences @@ -40,15 +39,17 @@ android { // Keep version in sync with /project.properties compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileOptions { sourceCompatibility = JAVA_VERSION targetCompatibility = JAVA_VERSION } + dexOptions { preDexLibraries = preDexEnabled } + defaultConfig { applicationId 'org.wikipedia' minSdkVersion 16 @@ -197,7 +198,7 @@ compile 'net.hockeyapp.android:HockeySDK:4.0.1' compile 'org.apache.commons:commons-lang3:3.5' - apt "com.jakewharton:butterknife-compiler:$butterKnifeVersion" + annotationProcessor "com.jakewharton:butterknife-compiler:$butterKnifeVersion" android.productFlavors.each { flavor -> String dep diff --git a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java index 6aff072..8603e1d 100644 --- a/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java +++ b/app/src/androidTest/java/org/wikipedia/feed/view/CardHeaderViewTest.java @@ -3,7 +3,8 @@ import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.test.filters.SmallTest; -import android.support.v4.view.TintableBackgroundView; +import android.support.v4.view.ViewCompat; +import android.support.v7.widget.AppCompatImageView; import android.widget.ImageView; import org.junit.Test; @@ -106,10 +107,10 @@ @Test public void testSetImageCircleColor() { setUp(WIDTH_DP_L, LayoutDirection.LOCALE, FontScale.DEFAULT, Theme.LIGHT, PrimaryTestImg.NONNULL, PrimaryTestStr.SHORT, SecondaryTestStr.SHORT, BLUE); - TintableBackgroundView imageView = findById(subject, R.id.view_card_header_image); - imageView.setSupportBackgroundTintList(null); + AppCompatImageView imageView = findById(subject, R.id.view_card_header_image); + ViewCompat.setBackgroundTintList(imageView, null); subject.setImageCircleColor(BLUE); - assertThat(imageView.getSupportBackgroundTintList(), notNullValue()); + assertThat(ViewCompat.getBackgroundTintList(imageView), notNullValue()); } @Theory public void testSetTitleStr(@NonNull PrimaryTestStr text) { diff --git a/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java b/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java index 42d5d39..61406de 100644 --- a/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java +++ b/app/src/androidTest/java/org/wikipedia/test/view/ViewTest.java @@ -10,7 +10,7 @@ import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.v4.text.TextUtilsCompat; -import android.support.v7.view.ContextThemeWrapper; +import android.view.ContextThemeWrapper; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java b/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java index 234a4c7..0253443 100644 --- a/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java +++ b/app/src/main/java/org/wikipedia/edit/summaries/EditSummaryTag.java @@ -4,15 +4,15 @@ import android.content.res.Resources; import android.support.annotation.ColorInt; import android.support.v4.content.res.ResourcesCompat; +import android.support.v7.widget.AppCompatTextView; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout.LayoutParams; -import android.widget.TextView; import org.wikipedia.R; import org.wikipedia.util.DimenUtil; -public class EditSummaryTag extends TextView { +public class EditSummaryTag extends AppCompatTextView { public static final int MARGIN = 4; public static final int PADDING = 8; diff --git a/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java b/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java index a921b20..3c5a4e3 100644 --- a/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java +++ b/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java @@ -9,6 +9,7 @@ import android.support.annotation.StringRes; import android.support.annotation.VisibleForTesting; import android.support.v4.content.ContextCompat; +import android.support.v4.view.ViewCompat; import android.support.v7.widget.AppCompatImageView; import android.support.v7.widget.PopupMenu; import android.view.MenuItem; @@ -60,7 +61,7 @@ new int[][]{new int[]{}}, new int[]{ContextCompat.getColor(getContext(), color)} ); - imageView.setSupportBackgroundTintList(colorStateList); + ViewCompat.setBackgroundTintList(imageView, colorStateList); return this; } diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java index 31f4bb1..01ba8fa 100644 --- a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java +++ b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java @@ -76,7 +76,7 @@ private void animateBackgroundColor(@NonNull View view, @ColorInt int targetColor) { final int animDuration = 500; - final ObjectAnimator animator = ObjectAnimator.ofObject(view.getBackground(), "color", + final ObjectAnimator animator = ObjectAnimator.ofObject(view.getBackground(), "tint", new ArgbEvaluator(), targetColor); animator.setDuration(animDuration); animator.start(); diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java index 057c7a2..aae8f59 100644 --- a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java +++ b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java @@ -12,6 +12,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.ContextCompat; @@ -213,11 +214,14 @@ // if we have a savedInstanceState, then the initial index overrides // the initial Title from our intent. initialFilename = null; - if (getSupportFragmentManager().getFragments() != null) { + + FragmentManager fm = getSupportFragmentManager(); + if (getSupportFragmentManager().getBackStackEntryCount() > 0) { FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - for (Fragment f : getSupportFragmentManager().getFragments()) { - if (f instanceof GalleryItemFragment) { - ft.remove(f); + for (int i = 0; i < fm.getBackStackEntryCount(); i++) { + Fragment fragment = fm.findFragmentById(fm.getBackStackEntryAt(i).getId()); + if (fragment instanceof GalleryItemFragment) { + ft.remove(fragment); } } ft.commitAllowingStateLoss(); diff --git a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java index 23c3b77..825d8df 100644 --- a/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java +++ b/app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java @@ -138,7 +138,7 @@ @Override public View newView(Context context, Cursor cursor, ViewGroup viewGroup) { - return getLayoutInflater(null).inflate(R.layout.item_search_recent, viewGroup, false); + return LayoutInflater.from(getActivity()).inflate(R.layout.item_search_recent, viewGroup, false); } @Override diff --git a/app/src/main/java/org/wikipedia/views/AppTextView.java b/app/src/main/java/org/wikipedia/views/AppTextView.java index 5f6a7dc..229cf49 100644 --- a/app/src/main/java/org/wikipedia/views/AppTextView.java +++ b/app/src/main/java/org/wikipedia/views/AppTextView.java @@ -1,8 +1,6 @@ package org.wikipedia.views; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.util.AttributeSet; public class AppTextView extends ConfigurableTextView { @@ -17,11 +15,6 @@ public AppTextView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - public AppTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); } @Override diff --git a/app/src/main/java/org/wikipedia/views/AppTextViewWithImages.java b/app/src/main/java/org/wikipedia/views/AppTextViewWithImages.java index 6fc72e4..7ebae6b 100644 --- a/app/src/main/java/org/wikipedia/views/AppTextViewWithImages.java +++ b/app/src/main/java/org/wikipedia/views/AppTextViewWithImages.java @@ -1,11 +1,9 @@ package org.wikipedia.views; -import android.annotation.TargetApi; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.drawable.Drawable; -import android.os.Build; import android.support.annotation.ColorInt; import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; @@ -35,11 +33,6 @@ public AppTextViewWithImages(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - public AppTextViewWithImages(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); } /** diff --git a/app/src/main/java/org/wikipedia/views/ConfigurableTextView.java b/app/src/main/java/org/wikipedia/views/ConfigurableTextView.java index de1cc8d..fbb0c06 100644 --- a/app/src/main/java/org/wikipedia/views/ConfigurableTextView.java +++ b/app/src/main/java/org/wikipedia/views/ConfigurableTextView.java @@ -1,15 +1,13 @@ package org.wikipedia.views; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; +import android.support.v7.widget.AppCompatTextView; import android.text.Spanned; import android.util.AttributeSet; -import android.widget.TextView; import static org.wikipedia.util.L10nUtil.setConditionalLayoutDirection; -public class ConfigurableTextView extends TextView { +public class ConfigurableTextView extends AppCompatTextView { public ConfigurableTextView(Context context) { super(context); } @@ -20,11 +18,6 @@ public ConfigurableTextView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - public ConfigurableTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); } public void setText(CharSequence text, String languageCode) { diff --git a/app/src/main/java/org/wikipedia/views/GoneIfEmptyTextView.java b/app/src/main/java/org/wikipedia/views/GoneIfEmptyTextView.java index d752ddd..952f756 100644 --- a/app/src/main/java/org/wikipedia/views/GoneIfEmptyTextView.java +++ b/app/src/main/java/org/wikipedia/views/GoneIfEmptyTextView.java @@ -1,8 +1,6 @@ package org.wikipedia.views; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.text.Editable; import android.text.TextWatcher; import android.util.AttributeSet; @@ -21,12 +19,6 @@ public GoneIfEmptyTextView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - init(); - } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) - public GoneIfEmptyTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); init(); } diff --git a/build.gradle b/build.gradle index 6007258..68ffb24 100644 --- a/build.gradle +++ b/build.gradle @@ -4,10 +4,9 @@ maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.facebook.testing.screenshot:plugin:0.4.2' classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.1.0' } } diff --git a/scripts/apps-android-wikipedia-lint b/scripts/apps-android-wikipedia-lint index cf6ca52..bab3e88 100755 --- a/scripts/apps-android-wikipedia-lint +++ b/scripts/apps-android-wikipedia-lint @@ -3,4 +3,4 @@ export ANDROID_HOME="$PWD/.sdk" -./gradlew -q clean lintAlphaDebug \ No newline at end of file +./gradlew -q clean lintAlphaDebug -- To view, visit https://gerrit.wikimedia.org/r/341346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie45aff43badbb448bf35651d26dfeffa22cb0b44 Gerrit-PatchSet: 9 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Mholloway <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Dbrant <[email protected]> Gerrit-Reviewer: Mholloway <[email protected]> Gerrit-Reviewer: Niedzielski <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
