From 39277d569fa8014d576e9821f1f382f38ae34b42 Mon Sep 17 00:00:00 2001
From: John Zhen M <kingdomlearke@hotmail.com>
Date: Tue, 1 Aug 2017 14:54:32 -0700
Subject: [PATCH 1/2] - Updated target, build tools and support libraries
 version to 26. - Added dependency repositories jcenter and maven.google.com.
 - Changed deprecated ActionBarActivity to AppCompatActivity.

---
 app/build.gradle                              | 21 ++++++++++++-------
 .../giga/ui/common/ToolbarActivity.java       |  4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c09addebf..166fcc455 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,20 @@
 apply plugin: 'com.android.application'
 
+allprojects {
+    repositories {
+        jcenter()
+        maven { url 'https://maven.google.com' }
+    }
+}
+
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.1'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 37
         versionName "0.9.10"
 
@@ -42,10 +49,10 @@ dependencies {
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile 'org.json:json:20160810'
 
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.0.0'
+    compile 'com.android.support:support-v4:26.0.0'
+    compile 'com.android.support:design:26.0.0'
+    compile 'com.android.support:recyclerview-v7:26.0.0'
 
     compile 'com.google.code.gson:gson:2.7'
     compile 'org.jsoup:jsoup:1.8.3'
diff --git a/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java b/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java
index 7e732f6f9..1d2bf2e26 100644
--- a/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java
+++ b/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java
@@ -1,12 +1,12 @@
 package us.shandian.giga.ui.common;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
 import org.schabi.newpipe.R;
 
-public abstract class ToolbarActivity extends ActionBarActivity {
+public abstract class ToolbarActivity extends AppCompatActivity {
     protected Toolbar mToolbar;
 
     @Override

From f020b88db3185534cdcb88750e5db66c474ea243 Mon Sep 17 00:00:00 2001
From: Mauricio Colli <mauriciocolli@outlook.com>
Date: Tue, 1 Aug 2017 22:56:04 -0300
Subject: [PATCH 2/2] Move maven repository declaration

- Remove redundant jcenter (already included in the "global application" build.gradle)
---
 app/build.gradle | 7 -------
 build.gradle     | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 166fcc455..7d0ce971c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,5 @@
 apply plugin: 'com.android.application'
 
-allprojects {
-    repositories {
-        jcenter()
-        maven { url 'https://maven.google.com' }
-    }
-}
-
 android {
     compileSdkVersion 26
     buildToolsVersion '26.0.1'
diff --git a/build.gradle b/build.gradle
index 596601301..a0725be17 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,5 +15,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url 'https://maven.google.com' }
     }
 }