Skip to content

Commit

Permalink
moved to lastest support version
Browse files Browse the repository at this point in the history
  • Loading branch information
anirudhramanan committed Mar 9, 2018
1 parent 23688ae commit 7867e2f
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 32 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ apply plugin: 'com.android.application'
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:design:25.1.0'
compile 'com.android.support:appcompat-v7:27.1.0'
compile 'com.android.support:design:27.1.0'
compile 'com.github.flipkart-incubator.batchman:batching:1.3.7'
compile 'com.github.flipkart-incubator.batchman:batching-gson:1.3.7'
}

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.flipkart.batchdemo"
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
Expand Down
12 changes: 6 additions & 6 deletions batching-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'

dependencies {
compile 'com.android.support:support-annotations:25.1.0'
compile 'com.android.support:support-annotations:27.1.0'
testCompile 'junit:junit:4.12'
}

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.3.7"

Expand All @@ -33,9 +33,9 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.0.1'
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"
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.11"
}
}
14 changes: 7 additions & 7 deletions batching-gson/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.google.code.gson:gson:2.8.0'
compile 'com.android.support:support-annotations:25.1.0'
compile 'com.google.code.gson:gson:2.8.2'
compile 'com.android.support:support-annotations:27.1.0'
compile 'com.github.flipkart-incubator.batchman:batching-core:1.3.7'

testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.2.2'
testCompile 'org.robolectric:robolectric:3.3.2'
}

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.3.7"

Expand Down
20 changes: 10 additions & 10 deletions batching/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: "net.ltgt.errorprone"

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'

lintOptions {
abortOnError false
}

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.3.7"
}
Expand All @@ -56,14 +56,14 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.robolectric:robolectric:3.2.2'
testCompile 'org.mockito:mockito-core:2.8.9'
testCompile 'org.robolectric:robolectric:3.3.2'
testCompile 'com.github.flipkart-incubator.batchman:batching-gson:1.3.7'
testCompile 'com.google.code.gson:gson:2.8.0'
testCompile 'com.google.code.gson:gson:2.8.2'

compile 'com.github.flipkart-incubator.batchman:batching-core:1.3.7'
compile 'com.android.support:support-annotations:25.1.0'
errorprone 'com.google.errorprone:error_prone_core:2.0.9'
compile 'com.android.support:support-annotations:27.1.0'
errorprone 'com.google.errorprone:error_prone_core:2.2.0'
}

buildscript {
Expand All @@ -72,9 +72,9 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.0.1'
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"
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.11"
}
}
11 changes: 9 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'

classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -40,6 +43,10 @@ allprojects {
repositories {
jcenter()
maven { url "https://jitpack.io" }
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Nov 26 16:20:47 IST 2017
#Fri Mar 09 12:15:49 IST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 comments on commit 7867e2f

Please sign in to comment.