Update tooling

Change-Id: I8a626302728900873c51d96009ab6108e1c6c80b

Author: bmeike

build.gradle

@@ -18,7 +18,7 @@ buildscript {
     ext {
         COMPILE_SDK_VERSION = 29
         BUILD_TOOLS_VERSION = "29.0.3"
-        KOTLIN_VERSION = '1.3.61'
+        KOTLIN_VERSION = '1.3.70'
         JACOCO_VERSION = '0.8.4'
 
         PROJECT_DIR = "${projectDir}"
@@ -33,7 +33,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jacoco:org.jacoco.core:$JACOCO_VERSION"
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
         classpath "com.github.spotbugs:spotbugs-gradle-plugin:3.0.0"

etc/jenkins/build.sh

@@ -5,6 +5,10 @@ GROUP='com.couchbase.lite'
 PRODUCT='coucbase-lite-android'
 EDITION='community'
 
+# These versions must match the versions in lib/build.gradle
+NDK_VERSION='20.1.5948944'
+CMAKE_VERSION='3.10.2.4988404'
+
 MAVEN_URL="http://mobile.maven.couchbase.com/maven2/cimaven"
 
 
@@ -34,14 +38,14 @@ echo "======== BUILD Couchbase Lite Android, Community Edition v`cat ../version.
 echo "======== Install Toolchain"
 yes | ${SDK_MGR} --licenses > /dev/null 2>&1
 ${SDK_MGR} --install 'build-tools;29.0.3'
-${SDK_MGR} --install 'cmake;3.10.2.4988404'
-${SDK_MGR} --install 'ndk;20.1.5948944'
+${SDK_MGR} --install "cmake;${CMAKE_VERSION}"
+${SDK_MGR} --install "ndk;${NDK_VERSION}"
 
 # The Jenkins script has already put passwords into local.properties
 cat <<EOF >> local.properties
 sdk.dir=${SDK_HOME}
-ndk.dir=${SDK_HOME}/ndk/20.1.5948944
-cmake.dir=${SDK_HOME}/cmake/3.10.2.4988404
+ndk.dir=${SDK_HOME}/ndk/${NDK_VERSION}
+cmake.dir=${SDK_HOME}/cmake/${CMAKE_VERSION}
 EOF
 
 echo "======== Build"

etc/jenkins/publish.sh

@@ -38,6 +38,13 @@ if [ -z "$WORKSPACE" ]; then
 fi
 
 echo "======== Publish candidate build to internal maven"
+## Really should promote the existing package, instead of re-publishing
+## Something like this:
+## curl -X POST  -H "Content-Type: application/json" \
+##     --data '{"API_Key": "<promote key>", "groupName": "com.couchbase.lite", "packageName": "couchbase-lite-android", "version": "2.7.0-43", "fromFeed": "cimaven", "toFeed": "internalmaven"}' \
+##      http://mobile.maven.couchbase.com/api/promotions/promote
+## At present that call fails to promote the entire package (bad PK copying the source tar)
+## so, for now, just republish the same bits.
 ./gradlew ciPublish -PbuildNumber=${BUILD_NUMBER} -PmavenUrl=${MAVEN_URL} || exit 1
 
 echo "======== Copy artifacts to staging directory"
@@ -72,3 +79,4 @@ zip -r "${ARTIFACTS}/${PRODUCT}-${VERSION}-android_${EDITION}.zip" * || exit 1
 popd
 
 echo "======== PUBLICATION COMPLETE"
+

lib/build.gradle

@@ -94,6 +94,7 @@ version = BUILD_VERSION
 android {
     compileSdkVersion COMPILE_SDK_VERSION
     buildToolsVersion BUILD_TOOLS_VERSION
+    // if you change this, be sure to update /etc/jenkins/build.sh
     ndkVersion '20.1.5948944'
 
     defaultConfig {
@@ -125,6 +126,8 @@ android {
     }
 
     buildTypes {
+        // NOTE: testCoverageEnabled is managed in the `coverage` task
+
         debug {
             buildConfigField "String", "BUILD_TIME", "\"${BUILD_TIME}\""
             buildConfigField "String", "BUILD_COMMIT", "\"${BUILD_COMMIT}\""
@@ -133,16 +136,13 @@ android {
 
             debuggable true
             minifyEnabled false
-            testCoverageEnabled false
 
             externalNativeBuild {
                 cmake {
                     arguments '-DANDROID_STL=c++_static', "-DANDROID_TOOLCHAIN=clang", '-DANDROID_PLATFORM=android-19', '-DCMAKE_BUILD_TYPE=Debug'
                     cppFlags "-std=c++11 -frtti -fexceptions -fPIC"
                 }
             }
-
-            // testCoverageEnabled is enabled in the `coverage` task
         }
 
         release {
@@ -166,6 +166,7 @@ android {
 
     externalNativeBuild {
         cmake {
+            // if you change this, be sure to update /etc/jenkins/build.sh
             version "3.10.2"
             path "${CBL_JNI_DIR}/CMakeLists.txt"
         }
@@ -413,8 +414,8 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 // Generate source.jar
 task sourcesJar(type: Jar) {
     archiveBaseName = "${CBL_ARTIFACT_ID}"
-    from android.sourceSets.main.java.srcDirs
     archiveClassifier = 'sources'
+    from android.sourceSets.main.java.srcDirs
 }
 
 artifacts {