Merge pull request #16 from jacobtabak/jt-update-buildscripts

hiteshsondhi88 · hiteshsondhi88 · commit 13726389339d · 2015-03-19T16:13:34.000+05:30
Update project to work with AS 1.X
diff --git a/.gitignore b/.gitignore
@@ -81,7 +81,7 @@ proguard/
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
 
-/*.iml
+*.iml
 
 ## Directory-based project format:
 .idea/
diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 16
-    buildToolsVersion "20.0.0"
+    compileSdkVersion rootProject.ext.compileSdkVersion as Integer
+    buildToolsVersion rootProject.ext.buildToolsVersion as String
 
     defaultConfig {
-        applicationId "com.github.hiteshsondhi88.libffmpeg"
-        minSdkVersion 16
-        targetSdkVersion 16
-        versionCode 25
-        versionName "0.2.5"
+        minSdkVersion rootProject.ext.minSdkVersion as Integer
+        targetSdkVersion rootProject.ext.targetSdkVersion as Integer
+        versionCode rootProject.ext.versionCode as Integer
+        versionName rootProject.ext.versionName as String
     }
 
     sourceSets.main {
@@ -20,7 +19,7 @@ android {
 
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 16
-    buildToolsVersion "20.0.0"
+    compileSdkVersion rootProject.ext.compileSdkVersion as Integer
+    buildToolsVersion rootProject.ext.buildToolsVersion as String
 
     defaultConfig {
         applicationId "com.github.hiteshsondhi88.sampleffmpeg"
-        minSdkVersion 16
-        targetSdkVersion 20
-        versionCode 25
-        versionName "0.2.5"
+        minSdkVersion rootProject.ext.minSdkVersion as Integer
+        targetSdkVersion rootProject.ext.targetSdkVersion as Integer
+        versionCode rootProject.ext.versionCode as Integer
+        versionName rootProject.ext.versionName as String
     }
 
     sourceSets.main {
@@ -24,7 +24,7 @@ android {
 
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,3 +17,12 @@ allprojects {
         jcenter()
     }
 }
+
+ext {
+    compileSdkVersion = 22
+    buildToolsVersion = '22'
+    targetSdkVersion = 22
+    minSdkVersion = 16
+    versionCode = 25
+    versionName = "0.2.5"
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 19 11:20:39 GMT+05:30 2014
+#Tue Mar 17 16:54:04 CDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
