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

Chagne Android Version #2480

Merged
merged 2 commits into from
May 24, 2019
Merged

Chagne Android Version #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb10d6e
Fix android version
YorkShen May 24, 2019
8d7e6e9
Ignore android version check during Apache release
YorkShen May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ checkstyle {
toolVersion = '6.9'
}

version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : "0.24.0"
version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : "0.24.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")) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_from_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ then
echo 'include ":android_sdk"'>settings.gradle
echo "ndk.dir=$2">local.properties

./gradlew :android_sdk:clean :android_sdk:assembleRelease
./gradlew :android_sdk:clean :android_sdk:assembleRelease -PignoreVersionCheck="true"

cp android_sdk/.externalNativeBuild/cmake/release/armeabi/Source/android/jsengine/libweexjsb.so android_sdk/libs/armeabi
cp android_sdk/.externalNativeBuild/cmake/release/armeabi/Source/android/jsengine/libweexjst.so android_sdk/libs/armeabi
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish_release_official.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ release-it --no-npm --no-git.commit --no-git.requireCleanWorkingDir --git.tagNam

# Publish Android to JCenter
cd android
./gradlew clean install bintray -Pweexversion="$1" -PbintrayUser=alibabaweex -PbintrayApiKey="$6"
./gradlew clean install bintray -PignoreVersionCheck="true" -Pweexversion="$1" -PbintrayUser=alibabaweex -PbintrayApiKey="$6"

# Publish iOS to Cocoapods