Removed remote debug and snapshot compile options

AOS002 · Jan 26, 2016 · 01e6574 · 01e6574
1 parent 4cbf54d
commit 01e6574
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,11 +11,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url 'http://cwe.cs.washington.edu:8082/artifactory/libs-release'
-        }
         ivy {
-            url 'http://cwe.cs.washington.edu:8082/artifactory/libs-snapshot'
+            url 'http://cwe.cs.washington.edu:8082/artifactory/libs-release'
         }
     }
 }

diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -34,9 +34,6 @@ android {
             minifyEnabled(minify)
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
-        snapshot {
-            // Build type for snapshots
-        }
         debug {
             testCoverageEnabled(testCoverage) // Allows AndroidTest JaCoCo reports to be generated
         }
@@ -67,12 +64,8 @@ dependencies {
     if (playServicesPath.exists() && gradle.useLocal) { // Local project is favoured
         compile project(playServicesName)
     } else {
-        releaseCompile(group: groupId, name: playServicesArtifactName,
-                version: playServicesRelease, ext: 'aar')
-        snapshotCompile(group: groupId, name: playServicesArtifactName,
-                version: playServicesSnapshot, ext: 'aar')
-        debugCompile(group: groupId, name: playServicesArtifactName,
-                version: playServicesSnapshot, ext: 'aar')
+        compile(group: groupId, name: playServicesArtifactName,
+                version: (useLatestPlayServices ? latestVersion : playServicesSnapshot), ext: 'aar')
     }
 
     // Testing-only dependencies