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 1f070994..8b4390f8 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ 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