Skip to content

Commit

Permalink
* [Android] Support arm64 by upgrading NDK to 16 and Gradle Plugin fo…
Browse files Browse the repository at this point in the history 
…r Android to 3.2.1 (apache#2561)
  • Loading branch information
@Darin726 @YorkShen
Darin726 authored and YorkShen committed Jun 18, 2019
1 parent f764b56 commit 9c3d5e8
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 40 deletions.
71 changes: 35 additions & 36 deletions build.gradle
View file
Expand Up @@ -6,8 +6,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion project.compileSdkVersion
buildToolsVersion project.buildToolsVersion

defaultConfig {
applicationId "com.alibaba.weex"
minSdkVersion project.minSdkVersion
Expand All @@ -17,7 +15,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk{
abiFilters "armeabi-v7a","armeabi","x86"
abiFilters "arm64-v8a", "armeabi-v7a", "x86"
}
}
applicationVariants.all { variant ->
Expand Down Expand Up @@ -71,57 +69,58 @@ android {


dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile "com.android.support:support-annotations:${project.supportLibVersion}"
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'org.awaitility:awaitility:3.0.0'
androidTestCompile 'org.awaitility:awaitility-proxy:3.0.0'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation "com.android.support:support-annotations:${project.supportLibVersion}"
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'org.awaitility:awaitility:3.0.0'
androidTestImplementation 'org.awaitility:awaitility-proxy:3.0.0'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestImplementation('com.android.support.test.espresso:espresso-contrib:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.android.support', module: 'support-v4'
exclude group: 'com.android.support', module: 'design'
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'com.android.support', module: 'recyclerview-v7'
})
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.squareup.picasso:picasso:2.5.2'
androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
androidTestImplementation 'com.android.support.test:runner:0.5'
androidTestImplementation 'com.squareup.picasso:picasso:2.5.2'
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
/*source dependency*/

compile project(':commons')
compile project(':weex_sdk')
implementation project(':commons')
implementation project(':weex_sdk')
//https://github.com/weexteam/weex-analyzer-android
//Weex-Analyzer provides several convenient tools such as Memory Monitor
// to optimize your application. It's not available by default,you can
// set WXAnalyzerDelegate#DEBUG==true to enable it
debugCompile 'com.taobao.android:weex_analyzer:0.1.0.5'
debugImplementation 'com.taobao.android:weex_analyzer:0.1.0.5'


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'
implementation 'com.loopj.android:android-async-http:1.4.9@aar'
implementation 'com.facebook.fresco:fresco:0.12.0+'
implementation 'com.facebook.fresco:animated-gif:0.12.0'

compile 'com.google.zxing:core:3.3.3'
implementation 'com.google.zxing:core:3.3.3'

compile 'com.squareup.okhttp:okhttp:2.3.0'
compile 'com.squareup.okhttp:okhttp-ws:2.3.0'
compile 'com.squareup.okio:okio:1.0.1'
compile "com.alibaba:fastjson:${project.fastjsonLibVersion}"
compile "com.android.support:support-v4:${project.supportLibVersion}"
compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
compile "com.android.support:design:${project.supportLibVersion}"
compile "com.android.support:support-annotations:${project.supportLibVersion}"
compile 'com.jakewharton.scalpel:scalpel:1.1.2'
compile 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
compile 'com.taobao.android:weex_inspector:0.24.2.4'
//compile project(":weex_inspector")
implementation 'com.squareup.okhttp:okhttp:2.3.0'
implementation 'com.squareup.okhttp:okhttp-ws:2.3.0'
implementation 'com.squareup.okio:okio:1.0.1'
implementation "com.alibaba:fastjson:${project.fastjsonLibVersion}"
implementation "com.android.support:support-v4:${project.supportLibVersion}"
implementation "com.android.support:appcompat-v7:${project.supportLibVersion}"
implementation "com.android.support:design:${project.supportLibVersion}"
implementation "com.android.support:support-annotations:${project.supportLibVersion}"
implementation 'com.jakewharton.scalpel:scalpel:1.1.2'
implementation 'com.taobao.android.weex_inspection:urlconnection_interceptor:1.0.0'
implementation 'com.taobao.android.weex_inspection:protocol:1.1.4.1'
implementation 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
implementation 'com.taobao.android:weex_inspector:0.24.2.4'
//implementation project(":weex_inspector")

// Bind actions to effects. See https://alibaba.github.io/bindingx/
compile 'com.alibaba.android:bindingx-core:1.1.1.2@aar'
compile 'com.alibaba.android:bindingx_weex_plugin:1.1.1@aar'
implementation 'com.alibaba.android:bindingx-core:1.1.1.2@aar'
implementation 'com.alibaba.android:bindingx_weex_plugin:1.1.1@aar'
}

if(file('../../license/LICENSE').exists()){
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/alibaba/weex/WXApplication.java
View file
Expand Up @@ -21,6 +21,7 @@
import android.app.Activity;
import android.app.Application;
import android.os.Bundle;
import android.support.multidex.MultiDex;

import com.alibaba.android.bindingx.plugin.weex.BindingX;
import com.alibaba.weex.commons.adapter.DefaultWebSocketAdapterFactory;
Expand Down Expand Up @@ -55,7 +56,7 @@ public class WXApplication extends Application {
@Override
public void onCreate() {
super.onCreate();

MultiDex.install(this);
/**
* Set up for fresco usage.
* Set<RequestListener> requestListeners = new HashSet<>();
Expand Down
4 changes: 1 addition & 3 deletions src/main/res/xml/preferences.xml
View file
Expand Up @@ -65,9 +65,7 @@
android:summary="@string/preferences_remember_duplicates_summary"/>
<CheckBoxPreference
android:key="preferences_history"
android:defaultValue="true"
android:title="@string/preferences_history_title"
android:summary="@string/preferences_history_summary"/>
android:defaultValue="true"/>
<CheckBoxPreference
android:key="preferences_supplemental"
android:defaultValue="true"
Expand Down

0 comments on commit 9c3d5e8

Please sign in to comment.