upgrade build tool to 23.0.2, upgrade recycler view and appcompat lib…

…s to 23.1.1 and v4 on preference fragment support library, updated witness verifications changed menu builder imports
duckduckgo · Feb 4, 2016 · 2f005d4 · 2f005d4
1 parent 61017f9
commit 2f005d4
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,22 +13,22 @@ apply plugin: 'witness'
 
 android {
   compileSdkVersion 23
-  buildToolsVersion "23.0.1"
+  buildToolsVersion "23.0.2"
 
   repositories {
     mavenCentral()
   }
 
   dependencies {
     compile 'ch.acra:acra:4.5.0'
-    compile ('com.android.support:recyclerview-v7:23.0.1') {
+    compile ('com.android.support:recyclerview-v7:23.1.1') {
       exclude module: 'support-v4'
       exclude module: 'support-annotations'
     }
     compile 'com.squareup:otto:1.3.8'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile project(':libs:OnionKit:libnetcipher')
-    compile ('com.android.support:appcompat-v7:23.0.1') {
+    compile ('com.android.support:appcompat-v7:23.1.1') {
       exclude module: 'support-v4'
     }
     compile project(':libs:android-support-v4-preferencefragment')
@@ -37,10 +37,10 @@ android {
   dependencyVerification {
     verify = [
             'ch.acra:acra:b46be215fefd703fe91bd8c2a9f59ba87f28924316c556468c5e6141d1fc87a7',
-            'com.android.support:recyclerview-v7:9621f5790e47010e14196c3ecee168cc68659316d19b2ef6b5a843f35a81c3db',
+            'com.android.support:recyclerview-v7:7606373da0931a1e62588335465a0e390cd676c98117edab29220317495faefd',
             'com.squareup:otto:13e2c8f5782de514cb161a1e03cdf394a6933431ce1aa2391f6289005b5a250c',
             'com.squareup.picasso:picasso:233e18f59d25b6aff475df1e01a0661677f88af73838a27eb23aa21b96a3ac6e',
-            'com.android.support:appcompat-v7:db48e76616882b00e407b19027aae4e92d129456a65b9bb4e4bc5262e3ad9b76',
+            'com.android.support:appcompat-v7:0a8762214382b7e8d4b989b4ac10b5c846b957d767ccb7bccbc6be5afa885a82',
     ]
   }
 

diff --git a/libs/android-support-v4-preferencefragment/libs/android-support-v4.jar b/libs/android-support-v4-preferencefragment/libs/android-support-v4.jar
diff --git a/src/com/duckduckgo/mobile/android/actionbar/DDGActionBarManager.java b/src/com/duckduckgo/mobile/android/actionbar/DDGActionBarManager.java
@@ -7,7 +7,7 @@
 import android.os.Build;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;

diff --git a/src/com/duckduckgo/mobile/android/adapters/FavoriteFeedCursorAdapter.java b/src/com/duckduckgo/mobile/android/adapters/FavoriteFeedCursorAdapter.java
@@ -9,7 +9,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.TouchDelegate;

diff --git a/src/com/duckduckgo/mobile/android/adapters/RecyclerFavoriteFeedAdapter.java b/src/com/duckduckgo/mobile/android/adapters/RecyclerFavoriteFeedAdapter.java
@@ -5,7 +5,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/src/com/duckduckgo/mobile/android/adapters/RecyclerMainFeedAdapter.java b/src/com/duckduckgo/mobile/android/adapters/RecyclerMainFeedAdapter.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/src/com/duckduckgo/mobile/android/adapters/RecyclerRecentFeedAdapter.java b/src/com/duckduckgo/mobile/android/adapters/RecyclerRecentFeedAdapter.java
@@ -6,7 +6,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/src/com/duckduckgo/mobile/android/fragment/FeedFragment.java b/src/com/duckduckgo/mobile/android/fragment/FeedFragment.java
@@ -11,7 +11,7 @@
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;

diff --git a/src/com/duckduckgo/mobile/android/fragment/RecentResultTabFragment.java b/src/com/duckduckgo/mobile/android/fragment/RecentResultTabFragment.java
@@ -2,8 +2,6 @@
 
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
-import android.support.v7.internal.view.menu.MenuBuilder;
-import android.support.v7.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -19,9 +17,7 @@
 import com.duckduckgo.mobile.android.adapters.RecentResultCursorAdapter;
 import com.duckduckgo.mobile.android.bus.BusProvider;
 import com.duckduckgo.mobile.android.events.SyncAdaptersEvent;
-import com.duckduckgo.mobile.android.events.WebViewEvents.WebViewItemMenuClickEvent;
 import com.duckduckgo.mobile.android.util.PreferencesManager;
-import com.duckduckgo.mobile.android.views.DDGDialogMenu;
 import com.duckduckgo.mobile.android.views.RecentSearchListView;
 import com.squareup.otto.Subscribe;
 

diff --git a/src/com/duckduckgo/mobile/android/fragment/SearchFragment.java b/src/com/duckduckgo/mobile/android/fragment/SearchFragment.java
@@ -7,7 +7,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/src/com/duckduckgo/mobile/android/fragment/TabFragment.java b/src/com/duckduckgo/mobile/android/fragment/TabFragment.java
@@ -7,7 +7,7 @@
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/src/com/duckduckgo/mobile/android/fragment/WebFragment.java b/src/com/duckduckgo/mobile/android/fragment/WebFragment.java
@@ -9,7 +9,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

diff --git a/src/com/duckduckgo/mobile/android/views/FavoriteSearchListView.java b/src/com/duckduckgo/mobile/android/views/FavoriteSearchListView.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.v7.internal.view.menu.MenuBuilder;
+import android.support.v7.view.menu.MenuBuilder;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.Menu;

diff --git a/src/com/duckduckgo/mobile/android/views/RecentSearchListView.java b/src/com/duckduckgo/mobile/android/views/RecentSearchListView.java
@@ -1,21 +1,14 @@
 package com.duckduckgo.mobile.android.views;
 
-import android.app.Activity;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.v7.app.ActionBarActivity;
-import android.support.v7.internal.view.menu.MenuBuilder;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.Menu;
 import android.view.View;
 import android.widget.Adapter;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import com.duckduckgo.mobile.android.DDGApplication;
-import com.duckduckgo.mobile.android.R;
-import com.duckduckgo.mobile.android.adapters.RecentResultCursorAdapter;
 import com.duckduckgo.mobile.android.bus.BusProvider;
 import com.duckduckgo.mobile.android.events.HistoryItemLongClickEvent;
 import com.duckduckgo.mobile.android.events.HistoryItemSelectedEvent;