diff --git a/build.gradle b/build.gradle index a51d47d..a9ee811 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:1.1.2' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.+' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/demo/build.gradle b/demo/build.gradle index 51dfa6a..9a97b42 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,20 +1,19 @@ apply plugin: 'android-sdk-manager' -apply plugin: 'android' +apply plugin: 'com.android.application' android { - compileSdkVersion 20 + compileSdkVersion 22 buildToolsVersion "20" defaultConfig { applicationId "com.daimajia.androidanimations" minSdkVersion 8 - targetSdkVersion 20 + targetSdkVersion 22 versionCode 1 versionName "1.0" } buildTypes { release { - runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c3b7ed8..fb59c1a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 627bd80..d1cec2d 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,19 +1,17 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { - compileSdkVersion 20 - buildToolsVersion "20.0.0" + compileSdkVersion 22 + buildToolsVersion "22.0.1" defaultConfig { - applicationId "com.daimajia.androidanimations.library" minSdkVersion 8 - targetSdkVersion 20 + targetSdkVersion 22 versionCode 13 versionName "1.1.3" } buildTypes { release { - runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -24,4 +22,4 @@ dependencies { compile 'com.nineoldandroids:library:2.4.0' compile 'com.daimajia.easing:library:1.0.0@aar' } -apply from: './gradle-mvn-push.gradle' \ No newline at end of file +apply from: './gradle-mvn-push.gradle'