Merge remote-tracking branch 'origin/develop' into release/2.1.1

.travis.yml

@@ -17,14 +17,15 @@ before_script:
   - echo $android_sdk_license > $ANDROID_HOME/licenses/android-sdk-license
 script:
   - ./gradlew dtglib:build dtgapp:build
-before_deploy:
-  - mv dtglib/build/intermediates/bundles/release/classes.jar dtglib-$TRAVIS_TAG.jar
+after_success:
+  - ./travis-push-to-bintray.sh
 deploy:
   provider: releases
   draft: false
   skip_cleanup: true
   file:
-    - dtglib-$TRAVIS_TAG.jar
+    - dtglib/build/outputs/aar/dtglib-release.aar
+    - dtgapp/build/outputs/apk/dtgapp-debug.apk
   on:
     tags: true
   api-key: $GH_TOKEN

dtglib/build.gradle

@@ -26,6 +26,10 @@ android {
     }
 }
 
+tasks.withType(Javadoc) {
+    options.addBooleanOption('Xdoclint:none', true)
+}
+
 dependencies {
     compile 'com.android.support:support-v4:25.3.1'
     testCompile 'junit:junit:4.12'

travis-push-to-bintray.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Required env vars:
+# TRAVIS_TAG: current tag (e.g. v0.1.2)
+# BINTRAY_USER, BINTRAY_KEY
+
+# Run locally:
+# TRAVIS_TAG=v0.1.2 BINTRAY_USER=username BINTRAY_KEY=fjkhsdfka3289r82rkfe ./travis-push-to-bintray.sh
+
+
+DRY_RUN=false
+
+# Only allow tags
+if [ -z "$TRAVIS_TAG" ]; then 
+    echo "Not a Travis tag build; will perform a dry-run."
+    TRAVIS_TAG=v0.0.0
+    DRY_RUN=true
+fi
+
+# Strip the "v" prefix
+TAG_VERSION_NAME=${TRAVIS_TAG:1}    
+
+# Only allow proper "digits.digits.digits" versions.
+if [[ ! $TAG_VERSION_NAME =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    echo "Not a proper version string; will perform a dry-run." 
+    DRY_RUN=true
+fi
+
+# Check that defined library version matches the tag.
+if ! grep -q "ext.dtglibVersion = '$TAG_VERSION_NAME'" version.gradle
+then
+    echo "Library version name in build.gradle does not match tag name; will perform a dry-run."
+    DRY_RUN=true
+fi
+
+
+# Assuming a successful playkit:build, create javadoc jar, sources jar, pom
+./gradlew dtglib:publishMavenPublicationToMavenLocal -x mavenAndroidJavadocs
+
+# Upload
+./gradlew dtglib:bintrayUpload -PdryRun=$DRY_RUN -PbintrayUser=$BINTRAY_USER -PbintrayKey=$BINTRAY_KEY