This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex-playground.git
The following commit(s) were added to refs/heads/master by this push:
new ba8d5a2 Update build.gradle to support unbundling JSC.
ba8d5a2 is described below
commit ba8d5a2ed106abbf8a349f7eb74a2ff8718e44fe
Author: york.sy <[email protected]>
AuthorDate: Tue Oct 15 17:33:49 2019 +0800
Update build.gradle to support unbundling JSC.
---
android/.gitignore | 1 +
android/build.gradle | 8 +++-----
android/commons/build.gradle | 1 -
android/playground/build.gradle | 11 +++--------
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/android/.gitignore b/android/.gitignore
index 71b6719..ffd0c2d 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -2,6 +2,7 @@
.idea
local.properties
*iml
+playground/src/main/jniLibs
build
captures
.settings
diff --git a/android/build.gradle b/android/build.gradle
index a91e060..90b9cc8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -39,13 +39,11 @@ subprojects {
}
}
ext {
- compileSdkVersion=26
- buildToolsVersion="26.0.3"
+ compileSdkVersion=28
minSdkVersion=14
- targetSdkVersion=26
+ targetSdkVersion=28
supportLibVersion="26.0.2"
fastjsonLibVersion="1.1.46.android"
- weexSdkVersion="0.26.1.7-SNAPSHOT"
+ weexSdkVersion="0.28.0.1-SNAPSHOT"
implementFromWeex = false
-
}
diff --git a/android/commons/build.gradle b/android/commons/build.gradle
index 37783ec..2422c6d 100644
--- a/android/commons/build.gradle
+++ b/android/commons/build.gradle
@@ -7,7 +7,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion project.compileSdkVersion
-// buildToolsVersion project.buildToolsVersion
resourcePrefix "weexcomm"
defaultConfig {
diff --git a/android/playground/build.gradle b/android/playground/build.gradle
index 09d315b..ac8e021 100755
--- a/android/playground/build.gradle
+++ b/android/playground/build.gradle
@@ -3,6 +3,9 @@ plugins {
}
apply plugin: 'com.android.application'
+if(!project.implementFromWeex){
+ apply from:
'https://raw.githubusercontent.com/apache/incubator-weex/release/0.28/android/sdk/buildSrc/download_jsc.gradle'
+}
android {
compileSdkVersion project.compileSdkVersion
@@ -44,14 +47,6 @@ android {
debuggable true
}
}
- sourceSets {
- main {
- jniLibs.srcDir(['libs'])
- java {
- srcDirs = ["src/main/java"];
- }
- }
- }
lintOptions {
abortOnError false
}