Merge pull request #117 from flipkart-incubator/core

Core
flipkart-incubator · Dec 28, 2016 · f8ecf49 · f8ecf49
2 parents a691bd2 + d481cd3
commit f8ecf49
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/batching-core/build.gradle b/batching-core/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
@@ -14,7 +15,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.2.1"
+        versionName "1.2.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -25,4 +26,17 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+}
+
+buildscript {
+    repositories {
+        maven { url 'http://repo1.maven.org/maven2' }
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.8"
+    }
 }
diff --git a/batching-gson/build.gradle b/batching-gson/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.android.support:appcompat-v7:25.0.1'
-    compile project(':batching-core')
+    compile 'com.github.flipkart-incubator.batchman:batching-core:1.2.2'
     testCompile 'junit:junit:4.12'
 }
 
@@ -29,7 +29,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.2.1"
+        versionName "1.2.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/batching/build.gradle b/batching/build.gradle
@@ -38,7 +38,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.2.1"
+        versionName "1.2.2"
     }
 
     buildTypes {
@@ -61,7 +61,7 @@ dependencies {
     testCompile project(':batching-gson')
     //temp fix, will need to look into this dependency since batching-gson already has this dependency
     testCompile 'com.google.code.gson:gson:2.4'
-    compile project(':batching-core')
+    compile 'com.github.flipkart-incubator.batchman:batching-core:1.2.2'
     compile 'org.jetbrains:annotations-java5:15.0'
     compile 'org.slf4j:slf4j-api:1.7.6'
     errorprone 'com.google.errorprone:error_prone_core:2.0.9'