Merge pull request #478 from wizmer/master

MobileOrg 2.0

MobileOrg/build.gradle

@@ -1,72 +1,31 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
-    }
-}
-apply plugin: 'android'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-    compile 'com.android.support:support-v4:13.0.+'
-    compile 'com.jcraft:jsch:0.1.50'
-    compile project(':libraries:locale')
-    compile fileTree(dir: 'libs', include: '*.jar')
-}
-
-
-def getVersionName = { ->
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'describe', '--tags'
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
-}
+apply plugin: 'com.android.application'
+apply plugin: 'eclipse'
+apply plugin: 'maven'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 17
-        versionCode 913
-        versionName getVersionName()
-    }
-
-    signingConfigs {
-        matburt {
-            storeFile file("other.keystore")
-            storePassword "android"
-            keyAlias "androiddebugkey"
-            keyPassword "android"
-        }
+        applicationId "com.matburt.mobileorg2"
+        minSdkVersion 17
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
     }
 
-    buildTypes {
-        release {
-            signingConfig signingConfigs.matburt
-        }
-        donate {
-            packageNameSuffix ".donate"
-            signingConfig signingConfigs.matburt
-        }
-        debug {
-            debuggable true
-        }
-    }
+    useLibrary 'org.apache.http.legacy'
 
-    packagingOptions { // This is a fix for a bug in the Android gradle plugin v. 0.7.0
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-    }
 }
 
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.jcraft:jsch:0.1.50'
+    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:support-v4:24.0.0'
+    compile 'com.android.support:recyclerview-v7:24.0.0'
+    compile 'com.android.support:design:24.0.0'
+    compile 'com.android.support:cardview-v7:24.0.0'
+    compile 'org.eclipse.jgit:org.eclipse.jgit:2.1.0.201209190230-r'
+}