From 2e93146eae6358569c14f89967591a31a9a628e7 Mon Sep 17 00:00:00 2001
From: Andrei <dan.andrei91@gmail.com>
Date: Mon, 25 May 2020 12:15:03 -0700
Subject: [PATCH] Update support libraries to api 28. Update dependencies

---
 clients/android/NewsBlur/AndroidManifest.xml |  8 +-----
 clients/android/NewsBlur/build.gradle        | 26 ++++++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/clients/android/NewsBlur/AndroidManifest.xml b/clients/android/NewsBlur/AndroidManifest.xml
index acc1ef5c9..b48a9a9aa 100644
--- a/clients/android/NewsBlur/AndroidManifest.xml
+++ b/clients/android/NewsBlur/AndroidManifest.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.newsblur"
-    android:versionCode="163"
-    android:versionName="9.0.1" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="28" />
+    package="com.newsblur">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/clients/android/NewsBlur/build.gradle b/clients/android/NewsBlur/build.gradle
index 719d475b1..cfab33ef2 100644
--- a/clients/android/NewsBlur/build.gradle
+++ b/clients/android/NewsBlur/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 
@@ -25,18 +25,24 @@ apply plugin: 'checkstyle'
 apply plugin: 'findbugs'
 
 dependencies {
-    compile 'com.android.support:support-core-utils:27.1.1'
-    compile 'com.android.support:support-fragment:27.1.1'
-    compile 'com.android.support:support-core-ui:27.1.1'
-    compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.squareup.okhttp3:okhttp:3.8.1'
-    compile 'com.google.code.gson:gson:2.8.2'
-    compile 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:support-core-utils:28.0.0'
+    implementation 'com.android.support:support-fragment:28.0.0'
+    implementation 'com.android.support:support-core-ui:28.0.0'
+    implementation 'com.jakewharton:butterknife:7.0.1'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "com.newsblur"
+        minSdkVersion 21
+        targetSdkVersion 28
+        versionCode 163
+        versionName "9.0.2"
+    }
     compileOptions.with {
         sourceCompatibility = JavaVersion.VERSION_1_7
     }