From a53648283ec225d531e0dbae1bfa251398691e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=B6?= Date: Sat, 1 Jun 2019 01:55:33 +0800 Subject: [PATCH] update toolchain configuration --- build.gradle | 4 +++- demo/build.gradle | 9 ++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 7 +++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 1a2e10a..674df2a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -14,5 +15,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/demo/build.gradle b/demo/build.gradle index b85eb05..0bceb40 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.2" defaultConfig { applicationId "com.daimajia.androidanimations" @@ -22,8 +21,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.nineoldandroids:library:2.4.0' - compile 'com.android.support:support-v4:25.1.1' - compile project(':library') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.nineoldandroids:library:2.4.0' + implementation 'com.android.support:support-v4:25.4.0' + implementation project(':library') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c40accd..b2fe388 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 13 22:06:02 CST 2017 +#Sat Jun 01 01:42:21 CST 2019 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-5.1.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index ff94fa6..1c5d4ea 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion 25 - buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 14 @@ -19,8 +18,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.daimajia.easing:library:2.0@aar' - compile 'com.android.support:support-compat:25.1.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.daimajia.easing:library:2.0@aar' + implementation 'com.android.support:support-compat:25.4.0' } apply from: './gradle-mvn-push.gradle'