Removed DI2E references (#18)

see: missioncommand/emp3-android#36

* Upgraded to use Gradle 3.4.
* Removed extra.gradle.
* Updated to no longer resolve dependencies from EMP-specific DI2E repositories.
* Added OJO as Maven repository resolving for SNAPSHOTS.

.travis.yml

@@ -3,12 +3,11 @@ language: android
 android:
   components:
     - tools
-    - platform-tools
+    #- platform-tools
     - build-tools-23.0.2
     - android-23
-    - extra-google-m2repository
-    #- sys-img-armeabi-v7a-android-23
-    #- sys-img-x86-android-23
+    - extra-android-m2repository
+    #- extra-google-m2repository
 
 jdk:
   - oraclejdk8
@@ -31,7 +30,7 @@ before_install:
   - export GRADLE_OPTS="-Dorg.gradle.daemon=false -XX:MaxPermSize=512m -Xmx2048m $GRADLE_OPTS"
   - export DEFAULT_JVM_OPTS=
 
-install: echo "skip 'gradle assemble' step"
+install: true
 
 script:
  - ./gradlew build --refresh-dependencies --continue --stacktrace

build.gradle

@@ -1,22 +1,13 @@
 buildscript {
-    apply from: 'gradle/extra.gradle'
+    ext {
+        version_emp3Android = "2.1.0-SNAPSHOT"
+    }
 
     repositories {
         mavenLocal()
         jcenter()
         maven {
-            url = "https://nexus.di2e.net/nexus/content/repositories/Private_EMP_Releases/"
-            credentials {
-                username empUsername
-                password empPassword
-            }
-        }
-        maven {
-            url = "https://nexus.di2e.net/nexus/content/repositories/Private_EMP_Snapshots/"
-            credentials {
-                username empUsername
-                password empPassword
-            }
+            url "https://oss.jfrog.org/artifactory/libs-snapshot"
         }
     }
 
@@ -28,21 +19,17 @@ buildscript {
 }
 
 ext {
+    empUsername = System.getenv("CI_USERNAME") ?: empUsername
+    empPassword = System.getenv("CI_PASSWORD") ?: empPassword
+
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+
     git = org.ajoberstar.grgit.Grgit.open(file('.')) // Open the Git repository in the current directory.
     revision = git.head().id                         // Get commitId of HEAD.
     //revision = git.head().abbreviatedId            // An alternative way using the abbreviatedId.
 }
 
 allprojects {
     apply plugin: 'emp.common'
-
-    repositories {
-        maven {
-            url = "https://nexus.di2e.net/nexus/content/repositories/Private_COEV3_Releases/"
-            credentials {
-                username empUsername
-                password empPassword
-            }
-        }
-    }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Oct 25 09:36:05 EDT 2016
+#Fri Feb 24 13:23:42 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"