Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Commit

Permalink
* [Android] Upgrade to API 26
Browse files Browse the repository at this point in the history
Remove dexposed, which is not supported by ART VM.

This closes #1332
  • Loading branch information
YorkShen committed Jul 17, 2018
1 parent a6dbdf2 commit 3df1c5d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 7 additions & 14 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,27 @@ 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'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}
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"
}
}
Expand Down
3 changes: 1 addition & 2 deletions android/playground/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion android/sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3df1c5d

Please sign in to comment.