Update gradle plugins and to Android studio 4.0

Author: schwabe

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")
     }
 }
 

gradle.properties

@@ -5,4 +5,4 @@
 
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableUnitTestBinaryResources=true
+android.enableUnitTestBinaryResources=false

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

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)
     }
 })