diff --git a/app/build.gradle b/app/build.gradle index 9d0e7a8..c2f4985 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 + buildToolsVersion "28.0.2" defaultConfig { applicationId "com.sdsmdg.demoexample" - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 28 versionCode 3 versionName "1.1.2" testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' @@ -28,7 +28,7 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile project(":tastytoast") - compile 'com.android.support:appcompat-v7:25.2.0' + compile 'com.android.support:appcompat-v7:28.0.0' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' } diff --git a/build.gradle b/build.gradle index 23295be..fa90618 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,12 @@ buildscript { repositories { + maven {url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' @@ -16,7 +18,9 @@ buildscript { allprojects { repositories { + maven {url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 52a8df0..30b3804 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=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/tastytoast/build.gradle b/tastytoast/build.gradle index 873bc74..cf54e83 100644 --- a/tastytoast/build.gradle +++ b/tastytoast/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 + buildToolsVersion "28.0.2" defaultConfig { - minSdkVersion 11 - targetSdkVersion 25 + minSdkVersion 14 + targetSdkVersion 28 versionCode 7 versionName "0.1.1" } @@ -24,7 +24,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.2.0' + compile 'com.android.support:appcompat-v7:28.0.0' compile 'com.facebook.rebound:rebound:0.3.8' }