From d8ed28cf46cb7d60021c2c6696ad2517b687effa Mon Sep 17 00:00:00 2001
From: ekoby <7406535+ekoby@users.noreply.github.com>
Date: Mon, 17 May 2021 15:27:33 -0400
Subject: [PATCH] Upgrade gradle (#184)

* upgrade gradle and AGP

* update fat-aar plugin
---
 build.gradle                             | 3 +--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 ziti-android/build.gradle                | 7 +++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index f4f1ace3..4b198c74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.3")
+        classpath("com.android.tools.build:gradle:4.2.1")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32")
     }
 
@@ -96,7 +96,6 @@ subprojects {
 
     repositories {
         mavenCentral()
-        jcenter()
     }
 
     tasks.withType(PublishToMavenRepository).all {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8019d5df..f54569eb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 NetFoundry, Inc.
+# Copyright (c) 2018-2021 NetFoundry, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
diff --git a/ziti-android/build.gradle b/ziti-android/build.gradle
index 14432d46..508cd69c 100644
--- a/ziti-android/build.gradle
+++ b/ziti-android/build.gradle
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 buildscript {
+    repositories {
+        mavenCentral()
+    }
     dependencies {
-        classpath 'com.kezong:fat-aar:1.3.4'
+        classpath 'com.github.kezong:fat-aar:1.3.6'
     }
 }
 
@@ -84,7 +87,7 @@ dependencies {
     implementation deps.kotlin
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
 
-    testApi deps.jupiterApi
+    testImplementation deps.jupiterApi
     testImplementation deps.jupiter
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'