From 2336b50de406ec7ca2d8d5fafa73de6b643033b6 Mon Sep 17 00:00:00 2001
From: ee11cbb19052e40b07aac0ca060c23ee
 <ee11cbb19052e40b07aac0ca060c23@gmail.com>
Date: Mon, 6 Mar 2017 11:00:12 -0500
Subject: [PATCH] fixes #59, fixes #60

* Updated view/build.gradle to reference the CMAPI and SEC Renderer version properties directly due to no longer using a Maven BOM file.
* Added build status and version widgets to README.MD.
* Updated .travis.yml to auto-publish to no longer require user intervention when releasing.
* Updated the git user.name used when preparing a release to 'missioncommand-bot'.
* Set executable bit on script files.
* Updated android-gradle-plugin to version 2.3.0.
* Updated Gradle version to 3.4.1.
* Updated to use Android build-tools version 25.0.2
---
 .travis.yml                                   |   9 ++-------
 README.md                                     |   4 ++++
 .../src/main/resources/common.gradle          |  10 ++++------
 build.gradle                                  |   2 +-
 gradle/bintray.gradle                         |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 54208 -> 54212 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 sdk/sdk-view/build.gradle                     |   7 ++-----
 travis/release.sh                             |   2 +-
 travis/snapshot.sh                            |   0
 10 files changed, 17 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 travis/release.sh
 mode change 100644 => 100755 travis/snapshot.sh

diff --git a/.travis.yml b/.travis.yml
index 5dc8c790..49e38d63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,9 @@ language: android
 android:
   components:
     - tools
-    #- platform-tools
-    - build-tools-23.0.2
+    - build-tools-25.0.2
     - android-23
     - extra-android-m2repository
-    #- extra-google-m2repository
 
 jdk:
   - oraclejdk8
@@ -27,10 +25,7 @@ cache:
     - $HOME/.android/build-cache
 
 before_install:
-  - chmod +x gradlew
-  - chmod +x travis/snapshot.sh
-  - chmod +x travis/release.sh
-  - export GRADLE_OPTS="-Dorg.gradle.daemon=false -XX:MaxPermSize=512m -Xmx2048m $GRADLE_OPTS"
+  - export GRADLE_OPTS="-Dorg.gradle.daemon=false -Xmx3072m $GRADLE_OPTS"
   - export DEFAULT_JVM_OPTS=
 
 install: true
diff --git a/README.md b/README.md
index 44bbc034..eeae5db5 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
 # emp3-android
+[![Build Status](https://travis-ci.org/missioncommand/emp3-android.svg?branch=master)](https://travis-ci.org/missioncommand/emp3-android)
+[![Download](https://api.bintray.com/packages/missioncommand/maven/emp3-android/images/download.svg)](https://bintray.com/missioncommand/maven/emp3-android/_latestVersion)
+
+## About
 Extensible Map Platform (EMP) Android development kit
diff --git a/build-support/emp3-gradle-plugin/src/main/resources/common.gradle b/build-support/emp3-gradle-plugin/src/main/resources/common.gradle
index de34878b..e360df5b 100644
--- a/build-support/emp3-gradle-plugin/src/main/resources/common.gradle
+++ b/build-support/emp3-gradle-plugin/src/main/resources/common.gradle
@@ -20,7 +20,7 @@ ext {
     android_minSdkVersion     = 19
     android_targetSdkVersion  = 23
     android_compileSdkVersion = 23
-    android_buildToolsVersion = "23.0.2"
+    android_buildToolsVersion = "25.0.2"
 }
 
 group = "mil.army.missioncommand"
@@ -41,10 +41,8 @@ repositories {
             password empPassword
         }
     }
-    repositories {
-        maven {
-            url "https://dl.bintray.com/missioncommand/maven/"
-        }
+    maven {
+        url "https://dl.bintray.com/missioncommand/maven/"
     }
     maven {
         url "https://oss.jfrog.org/artifactory/libs-snapshot"
@@ -74,7 +72,7 @@ dependencyManagement {
 }
 
 task wrapper(type: Wrapper, description: "Generates gradlew[.bat] scripts") {
-    gradleVersion = '3.4'
+    gradleVersion = '3.4.1'
 }
 
 if (JavaVersion.current().isJava8Compatible()) { // disable lint for java8
diff --git a/build.gradle b/build.gradle
index 9283d8a5..e7abf06d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:4.9.1'
         classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.1.0'
         classpath 'org.ajoberstar:grgit:1.7.0'
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
index 1dff23bd..8f32a3bd 100644
--- a/gradle/bintray.gradle
+++ b/gradle/bintray.gradle
@@ -16,7 +16,7 @@ artifactory {
 
 bintray {
     dryRun   = false
-    publish  = false
+    publish  = true
     override = false
 
     user = bintrayUser
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1f070994b0b3425c06d308be47e89a3af15d26a7..8b4390f86dde01d18d1fbdb598db9e66aa54b48d 100644
GIT binary patch
delta 2083
zcmZ9Ne@t6d6vuC03+;eXD1!j61zI9d*!U@KV;~X~4HyK6V>*6qjTi(5LSRgZ;vfD&
zX2ResZcb1X6#@ykF+m9ltd!prD8@LqY{DkOWHB<0x;Zn?JC89QFL}8q-+s>bp8L+d
zx5MpnYr9;XktSE{WK5-E@{i4p>L4`^sa(ky%Snu}gN;vRd9M20saUU&u}9<|E#}5{
zgIpM<LumLbQW$zoGN&Cv08corkPzT(Qd01|cF2(eS05!ufj6Hg1}F5_6r{XtbQj@L
z(;f#wf%fnv`sHNADUtPy&Qg<7m3YX5g83I$oG2K`{aj>@6#Pg5B$#vL%jnW<-X)B^
z)8<8vg6_g~&J~qZ<C~MOG&wN#p&H(8^Mvwl=U!V;hXX-1WnDx=P{l2G0d6kInQNCZ
z_NAP$y|7-b2RBgmK3zE>BVJQw7lWJCxnhu9)2E=H?$_>@QxI3zp`~EC$zMf*@}qeX
zzS0aLQ{E~UgX*^LmBgfXJrL{8=uQ$1PhZFqm9>kv#Ndbi-^E~R07S!rL4P^beQM&*
z58^q-4&XwgAhX67{#)?vwGO3F0;nzNa?k8S$g{)++G7;hW~EB~^@*Q7vHu?UW~9lu
zoosW9z_*sirF#VKSz<G>Td4>$oQEF8#wZTWIFwbq7O~Z9dxo<lV;Jg2e1*P3%Lvb{
zG5FN#1@j}$Bwa_zPX?J*PjIsu`~|0#+lMMU(cvn-Mu}4xWLTq!Ir>jg*s3FAzOIY~
zNf=LPwZ;YrKIY56oqGcrHy6fYButW)CM?$mK<KCo)v<4s=j1+Enh_Fxyy4V_{0Yix
zp6Gbq0QGi}mW}b;F+IsGdOc)}iE=*5=|+^j;BBKTv~I{fC?7Quy)+g?(>aavTywbS
zJFX+?FiLe1B=tnN2!+uquHE~|<gI4xx({Op$tpae#e7}`H^#LDJC^#N(_^P^n-~j_
zz^^AFER^L4krP__hW+&gYo9qW7V3?!1RjMW6Z@#BmI<Eg$)$PbCW2^=8FgMtBkqm6
z_-S`b(he37=w?;I`vo4bI^{z1+<b37-w#0@zJZd2XegVE_7@JMAV1u18VS<~!;^l(
z*@2}=o*OoUq0$7wQ{DkWTE6DVg*MDHDYv({tq{RLSS-};+PYJPq(?W!_Puka2+kLU
z2!)e-bV+t!D!ME1w53RjDlH@T&a%fKXWE6TE1u>#zJlbgX%CVvp`@%tDGvPXqUFh?
z*pgbjc%1R#iIZ3=s=%)*9_nU9yM`H_yIhUs=)m>3Mv$qbnxGq51$ZER@rdo0<nOJ4
z#vvcj*&=D~7i>JYUQ6XP*g{DfL@A;UB_sT6qq_^-W_j*P6HytnAw<13%ggS=nc3%P
zzLY-I-w9aj)Q;`*%{5cnVxa>B&lxB+ZI0(&ZH0GQ!>RYew?15R?Cfc5&ba&bZ(R(R
z=3*)BE~X`Sky~9C4<)nWQj_gozx;|**Wyy+B};v#o8Y$jV9K}6^IZJ}lGJuRNxSVl
zw|EgH6I9xbw35EzuPV=CGdpqHCP?gN`U%v0<F(nQ)j;)~XR%Fbm=Gm_hX$x8@e6_E
zsw?(7Z$s!Ry6%yHFAb7w$AXSP$;~YRj}KwvVm3Rhc`%ZVH#F1Y>n{O03+OC{u!q}O
bh5z$-*{5#3;PE7Hc@99scVUj*7D4(Sv4WK5

delta 2049
zcmZWqZBSHI7(VwdunX+6d`ZA1SQZr!<ikuY#a(j>L`Mnv!5GBKn!w1oxemw>rOi~<
zk3Qt>V?=BqolG$*ab(5;WmaHeVS$BcBF&^y)M(WH$f#lOeGh|Nx-)mrJI_AP^S<Yt
z_ng~#Le+6XrOVl<@(N{4qhY%$^A712>u|{KHZ*3M7-M;d%y}Vq?f2{gd%`O~-pN>%
zJh&5Rm`am}mL$Q?R}Ns6-$W3O*~L?3NjH5Miwt0FG3>E~fvro|vekdehxnU=FY+KT
zLM;*!DZR>rH=h30i;!20L23$Yi7UP308XZi6Yyc`C!A|omZu|RpD90t^0t0p`Rgk`
z#+HQROL?yq`m{XCZTBNyTj6o8v|7d}0F$*qwH3X;v?j}Ai`#llq~QCV_jqu;Y{Z+8
zYFiT_kYK+>K<M5F0tG=89v)n;Eabt9Rp-3uuj!iADhk#d_$HWwiP{(q1-?gyIQdFF
zaE`q}#e=G2qiW*hG(F~3<TkJ4hM%9w<H+A<Z}DKP^)3(k&jU9sZj0eQ?_7MJ{sO&Y
zvudy^A1sdNW91!HYs?!)!$WYRgYeDSD2SnKwilq?v0T{<FztADx4f@NW}^Iqj~5?i
ze(P|w*-KLAdd*k(D-;)I6eafUJIY_1FNDTRl5k7j!sPjuzf2z#oEpYH#rhKzmQezv
z`!9ek!U9O_)Eeac6O;LSPa)|tzD5N((T~UletMX6a<Zar732_qBqxBoQ%kLQrBf13
z!K4r9N+u|yOA>_$gp5$rwUBb(uRh(O$K^8PQY}~5`AeiVJAL75*TNXN&>hwNztti!
z!<Vr%1-TqzyG>+xv?+Y*M?6+5^z$dP$w-F#jr#vB*PZHZU)(|CQ8ZqvFt#L;=z8~J
znn8e566;cC3X3AB2%)!92|DBqC+IXnLCa=X8o1#MCio%3r6z*+8`ZG9hr=6sB=J%%
zjOQjpRxe+>MufgCL`Z_M9s`LVA(Uq!@fJZ1A6Y`6Zjf)uAMXwoMPt=b_{J%!PqV^i
z>moSZt1ZBjt7uJJo;lCQR^FO3jb<$`Q#6|_&h+e@ti_$G_h#&wIa0<hfZ%$;AajcJ
zYln{^Cs940)3_71H^;$yu4p0}t9!TAqS0X;UVaL*&&rS(1=n2R^67?$E=k;FBkgJ1
zBCzyn3AXh~VuYRG@A^Vw<lOb;1%oF9#=cfDwn|~?4dZ>8Buna-M6m)46>H#fzm_VA
z_sY^npsYkLTOs?Yk}3(@r<cj3zuhkhE5OH{P0~M$N8`s)wi{<Fe-NHLcWS7#v^S&S
z^#LyJa7*IS0|*=8u{)S5Ha%7P*ooSMct|szh%x#Z(grqB#{C15@BoesWKqVK&S~yv
z;QU<Jr>hkTcRghcI2sA&L7s8Tpd?xw;O&MKm~?UIBtm7!5HiBeLAq<<Uxd~*kvL;0
zp0cd>gx$D}S!(byTBFFaz8Q&YXES()B=O)G()OGQnw@I8M-s1|g*|PFu+L+pY1AX+
zY9;7*kCC$6jMM#-i3`6GS1?_XrTsiwMuB-aj)+ma!hUcg=`x<`l?vk4HgtS$wki6C
xC7}W)hRu|6$%rH}2Sht!p>#xRz^grb?uCwDzd6s#4zM{Qp?M_G=afUn{{vJFM+^V}

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 60b5044e..3252ed1b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 23 12:25:16 EST 2017
+#Mon Mar 06 10:56:43 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
diff --git a/sdk/sdk-view/build.gradle b/sdk/sdk-view/build.gradle
index e0989863..bab6f093 100644
--- a/sdk/sdk-view/build.gradle
+++ b/sdk/sdk-view/build.gradle
@@ -53,13 +53,10 @@ publishing {
 }
 
 android {
-    def version_sec_renderer = dependencyManagement.importedProperties['version_renderer']
-    def version_sec_cmapi = dependencyManagement.importedProperties['version_cmapi']
-
     // Add sec renderer id and version information to BuildConfig to be retrieved by About class.
     buildTypes.each {
-        it.buildConfigField "String", "Implementation_Sec_Renderer_Id", "\"sec.web.renderer:mil-sym-android-renderer ${version_sec_renderer}\""
-        it.buildConfigField "String", "Implementation_Sec_Cmapi_Id", "\"org.cmapi.primitives:common-map-geospatial-notation ${version_sec_cmapi}\""
+        it.buildConfigField "String", "Implementation_Sec_Renderer_Id", "\"sec.web.renderer:mil-sym-android-renderer ${version_renderer}\""
+        it.buildConfigField "String", "Implementation_Sec_Cmapi_Id", "\"org.cmapi.primitives:common-map-geospatial-notation ${version_cmapi}\""
     }
 
     lintOptions {
diff --git a/travis/release.sh b/travis/release.sh
old mode 100644
new mode 100755
index dad23d87..4c596615
--- a/travis/release.sh
+++ b/travis/release.sh
@@ -16,7 +16,7 @@ if [[ -n $TRAVIS_TAG ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
 
     RELEASE_BRANCH=release/$TRAVIS_TAG
 
-    git config user.name "Travis CI"
+    git config user.name "missioncommand-bot"
     git config user.email "builds@travis-ci.com"
     git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 
diff --git a/travis/snapshot.sh b/travis/snapshot.sh
old mode 100644
new mode 100755