Skip to content

Commit

Permalink
Merge pull request #9 from Yalantis/develop
Browse files Browse the repository at this point in the history
Updated gradle versions
  • Loading branch information
warko-san committed Jan 6, 2017
2 parents 15bdbaa + a93d8cd commit e089eb9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}

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 @@
#Wed Apr 10 15:27:10 PDT 2013
#Fri Jan 06 10:27:57 EET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
10 changes: 6 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
group='com.yalantis'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
minSdkVersion 11
targetSdkVersion 22
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:22.1.1'
compile 'com.android.support:support-v4:24.1.1'
}

apply from: '../mavenpush.gradle'
8 changes: 4 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.yalantis.taurus.sample"
minSdkVersion 11
targetSdkVersion 22
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
}

dependencies {
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:appcompat-v7:24.1.1'
compile project (':library')
}

0 comments on commit e089eb9

Please sign in to comment.