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

Commit

Permalink
[Android] Update build.gradle and TravisCI (#2703)
Browse files Browse the repository at this point in the history
* Update build.gradle and submodule

* Remove gradle-wrapper in sdk dir.

* Update danger.js

* Update submodule

* Update travis

* Update build.gradle

* Update travis
  • Loading branch information
YorkShen authored and lucky-chen committed Jul 15, 2019
1 parent b0ba7bc commit 05555b3
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ script:
echo "The value of hasAndroidFile is ${hasAndroidFile}"
if [[ "$hasAndroidFile" =~ "hasAndroidFile" ]]; then
cd android
./gradlew clean install ${GRADLE_ABI} --info
./gradlew clean install -PbuildRuntimeApi=true ${GRADLE_ABI} --info
./gradlew install -PbuildRuntimeApi=false ${GRADLE_ABI} --info
fi
;;
"jsfm" )
Expand Down
3 changes: 0 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,9 @@ ext {
targetSdkVersion=26
supportLibVersion="26.0.2"
fastjsonLibVersion="1.1.46.android"
//Default value for buildCpp is true
buildCpp = !project.hasProperty("buildCpp") || buildCpp.equals("true")
//Default value for disableCov is false
disableCov = project.hasProperty("disableCov") && disableCov.equals("true")
implementFromWeex = true

}

//task clean(type: Delete) {
Expand Down
6 changes: 3 additions & 3 deletions android/sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ checkstyle {
toolVersion = '6.9'
}

version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : "0.20.0.1"
version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : '0.26.0.1'

//Check version, the version must have 4 sections. The leading three section must be number, and the last section is odd number with or without suffix string.
if (!project.hasProperty('ignoreVersionCheck') || !project.getProperty('ignoreVersionCheck').equals("true")) {
version.tokenize('.').eachWithIndex { it, i ->
if (i < 3) {
assert it.isNumber() : "Please use semantic versioning witch 4 sections, you are using ${$ { i } + 1} section instead."
assert it.isNumber() : "Please use semantic versioning witch 4 sections, you are using ${${i} + 1} section instead."
} else if (i == 3) {
it.split("[-_]").toList().eachWithIndex { inner_it, inner_i ->
if (inner_i == 0) {
Expand All @@ -64,7 +64,7 @@ if (!project.hasProperty('ignoreVersionCheck') || !project.getProperty('ignoreVe
}
}.size == 4
} else {
assert false: "Please use semantic versioning witch 4 sections, you are using ${$ { i } + 1} section instead."
assert false: "Please use semantic versioning witch 4 sections, you are using ${${i} + 1} section instead."
}
}
}
Expand Down
Binary file removed android/sdk/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions android/sdk/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

4 changes: 1 addition & 3 deletions dangerfile-android.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ const getFileType = file => {
return type_ios_sdk;
} else if (file.match(/WeexSDKTests\//)) {
return type_ios_test;
} else if (file.match(/android\/sdk\/src\/test\/.+\.java/)) {
return type_android_test;
} else if (file.match(/android\/sdk\/src\/main\/java\/.+\.java/)) {
} else if (file.match(/android\/sdk\//)) {
return type_android_sdk;
} else if (file.match(/html5\/(shared|frameworks|render|runtime|services)\/.+\.js/)) {
return type_jsfm;
Expand Down
2 changes: 1 addition & 1 deletion weex-playground
Submodule weex-playground updated 127 files

0 comments on commit 05555b3

Please sign in to comment.