diff --git a/.travis.yml b/.travis.yml index 95624a6211..0f9cfb6f04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,8 @@ matrix: components: - platform-tools - tools - - build-tools-25.0.3 - - android-25 + - build-tools-26.0.3 + - android-26 - extra-google-m2repository - extra-android-m2repository - sys-img-armeabi-v7a-android-22 diff --git a/android/build.gradle b/android/build.gradle index 32f7927f33..e78c562da7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,21 +14,15 @@ plugins { // id "com.github.dcendents.android-maven" version "1.5" } -repositories { - mavenLocal() - jcenter() -} - subprojects { repositories { mavenLocal() jcenter() + maven { + url 'https://maven.google.com' + } } buildscript { - repositories { - mavenLocal() - jcenter() - } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' @@ -36,12 +30,11 @@ subprojects { } } ext { - compileSdkVersion=25 - buildToolsVersion="25.0.3" + compileSdkVersion=26 + buildToolsVersion="26.0.3" minSdkVersion=14 - appMinSdkVersion=15 - targetSdkVersion=25 - supportLibVersion="25.3.1" + targetSdkVersion=26 + supportLibVersion="26.0.2" fastjsonLibVersion="1.1.46.android" } } diff --git a/android/playground/app/build.gradle b/android/playground/app/build.gradle index 3e4954d115..941e624f0e 100755 --- a/android/playground/app/build.gradle +++ b/android/playground/app/build.gradle @@ -10,7 +10,7 @@ android { defaultConfig { applicationId "com.alibaba.weex" - minSdkVersion project.appMinSdkVersion + minSdkVersion project.minSdkVersion targetSdkVersion project.targetSdkVersion versionCode 17 versionName "0.18.0-beta-3" @@ -101,7 +101,6 @@ dependencies { debugCompile 'com.taobao.android:weex_analyzer:0.1.0.5' - compile 'com.taobao.android:dexposed:0.1.8' compile 'com.loopj.android:android-async-http:1.4.9@aar' compile 'com.facebook.fresco:fresco:0.12.0+' compile 'com.facebook.fresco:animated-gif:0.12.0' diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index d8ce3bca42..e2b7871c4f 100755 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -109,7 +109,7 @@ android { buildConfigField "long", "X86_Size", "${X86_Size}" buildConfigField "String", "buildJavascriptFrameworkVersion", "\"${jsfmVersion}\"" buildConfigField "String", "buildVersion", "\"${version}\"" - minSdkVersion 14 + minSdkVersion project.minSdkVersion targetSdkVersion project.targetSdkVersion multiDexEnabled true