Merge branch 'develop'0.7.0

1 files changed, 2 insertions, 28 deletions

diff --git a/build.gradle b/build.gradle
index 1a4f6932..6888c764 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,3 @@
-import au.com.coherentsoftware.gradle.mercurial.task.*
 import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
@@ -8,7 +7,7 @@ buildscript {
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:0.11.+'
-    classpath 'au.com.coherentsoftware.gradle:Gradle-MercurialMqPlugin:1.1.0+'
+    classpath 'org.ajoberstar:gradle-git:0.10+'
   }
 }
 
@@ -16,29 +15,4 @@ allprojects {
   repositories {
     mavenCentral()
   }
-}
-
-apply plugin: 'mercurial-mq'
-
-// task checkoutIcsOpenvpn( type: GitCheckout ) {
-//   branch = 'ics-openvpn-upstream'
-// }
-
-// task cloneIcsOpenVPN( type: HgClone ) {
-//   ext.srcFile = file('build.gradle')
-//   ext.destDir = new File('.', 'ics-openvpn')
-//   inputs.file srcFile
-//   outputs.dir destDir
-     
-//   sourceUrl = 'https://code.google.com/p/ics-openvpn/'
-// }
-
-// task updateIcsOpenVPN( type: HgUpdate, dependsOn: 'pullIcsOpenVPN' ) {
-//   workingDir = 'ics-openvpn'
-//   branch = 'default'
-// }
-
-// task pullIcsOpenVPN( type: HgPull ) {
-//   sourceUrl = 'https://code.google.com/p/ics-openvpn/'
-//   workingDir = 'ics-openvpn'
-// }
\ No newline at end of file
+}
\ No newline at end of file