From b48e72be4f17c99d74e7a596625ad82bb97f2311 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 3 Jun 2020 01:31:23 +0200
Subject: Update gradle plugins and to Android studio 4.0

---
 build.gradle.kts                         | 4 ++--
 gradle.properties                        | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 5 ++---
 main/build.gradle.kts                    | 3 ++-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1ede308f..7346790b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,8 +10,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
+        classpath("com.android.tools.build:gradle:4.0.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 00f3339f..bb3d1bd9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,4 @@
 
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableUnitTestBinaryResources=true
+android.enableUnitTestBinaryResources=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9abb803e..a0d9f2b1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Mon Oct 28 16:47:57 CET 2019
+#Wed Jun 03 01:41:27 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index d95661e1..e88aec35 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -141,6 +141,7 @@ fun registerGenTask(variantName: String, variantDirName: String): File {
                 "-Isrc/main/cpp/openvpn3/client", "-Isrc/main/cpp/openvpn3/",
                 "-o", "${genDir}/ovpncli_wrap.cxx", "-oh", "${genDir}/ovpncli_wrap.h",
                 "src/main/cpp/openvpn3/javacli/ovpncli.i"))
+
     }
     return baseDir
 }
@@ -149,7 +150,7 @@ android.applicationVariants.all(object : Action<ApplicationVariant> {
     override fun execute(variant: ApplicationVariant) {
         val sourceDir = registerGenTask(variant.name, variant.baseName.replace("-", "/"))
         val task = tasks.named("generateOpenVPN3Swig${variant.name}").get()
-
+        
         variant.registerJavaGeneratingTask(task, sourceDir)
     }
 })
-- 
cgit v1.2.3