Merge branch 'hannesa2-AndroidStudio3.4.1' into github-master

Author: developernotes

android-database-sqlcipher/build.gradle

@@ -5,58 +5,45 @@ apply from: "maven.gradle"
 
 android {
 
-  compileSdkVersion "${compileAndroidSdkVersion}" as Integer
-
-  defaultConfig {
-    versionName "${clientVersionNumber}"
-    minSdkVersion "${minimumAndroidSdkVersion}"
-    targetSdkVersion "${targetAndroidSdkVersion}"
-    versionCode 1
-    versionName "${clientVersionNumber}"
-  }
-
-  editorconfig {
-   includes = ["src/**", "*.gradle"]
-   excludes = ["src/main/external/sqlcipher/**", "src/main/external/openssl-*/**"]
-  }
-
-  buildTypes {
-    debug {
-      debuggable true
+    compileSdkVersion "${compileAndroidSdkVersion}" as Integer
+
+    defaultConfig {
+        versionName "${clientVersionNumber}"
+        minSdkVersion "${minimumAndroidSdkVersion}"
+        targetSdkVersion "${targetAndroidSdkVersion}"
+        versionCode 1
+        versionName "${clientVersionNumber}"
+        archivesBaseName = "${archivesBaseName}-${versionName}"
     }
-    release {
-      debuggable false
-      minifyEnabled false
+
+    editorconfig {
+        includes = ["src/**", "*.gradle"]
+        excludes = ["src/main/external/sqlcipher/**", "src/main/external/openssl-*/**"]
     }
-  }
 
-  sourceSets {
-    main {
-      jniLibs.srcDirs "${rootProject.ext.nativeRootOutputDir}/libs"
+    buildTypes {
+        debug {
+            debuggable true
+        }
+        release {
+            debuggable false
+            minifyEnabled false
+        }
     }
-  }
-
-  dependencies {
-    implementation "androidx.sqlite:sqlite:2.0.1"
-  }
-
-  clean.dependsOn cleanNative
-  check.dependsOn editorconfigCheck
-  buildNative.mustRunAfter buildAmalgamation
-  buildAmalgamation.mustRunAfter buildOpenSSL
-  preBuild.dependsOn([buildOpenSSL, buildAmalgamation, buildNative])
-
-  afterEvaluate {
-    android.libraryVariants.all { variant ->
-      variant.outputs.each { output ->
-        def outputFile = output.outputFile
-        if (outputFile != null && outputFile.name.endsWith(".aar")) {
-          def buildSuffix = variant.buildType.debuggable ? "-debug" : ""
-          def versionFileName = "${archivesBaseName}-${clientVersionNumber}${buildSuffix}.aar"
-          output.outputFileName = versionFileName
+
+    sourceSets {
+        main {
+            jniLibs.srcDirs "${rootProject.ext.nativeRootOutputDir}/libs"
         }
-      }
     }
-  }
 
+    dependencies {
+        implementation "androidx.sqlite:sqlite:2.0.1"
+    }
+
+    clean.dependsOn cleanNative
+    check.dependsOn editorconfigCheck
+    buildNative.mustRunAfter buildAmalgamation
+    buildAmalgamation.mustRunAfter buildOpenSSL
+    preBuild.dependsOn([buildOpenSSL, buildAmalgamation, buildNative])
 }

build.gradle

@@ -1,5 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
   repositories {
     google()
@@ -9,7 +7,7 @@ buildscript {
     }
   }
   dependencies {
-    classpath "com.android.tools.build:gradle:3.2.0"
+    classpath "com.android.tools.build:gradle:3.4.1"
     classpath "gradle.plugin.org.ec4j.gradle:editorconfig-gradle-plugin:0.0.3"
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip