[GitHub] YorkShen closed pull request #1491: * [Android] Fix build problem of apache release

[GitBox]

YorkShen closed pull request #1491: * [Android] Fix build problem of apache 
release
URL: https://github.com/apache/incubator-weex/pull/1491
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 2338a2dd52..3807fc70f5 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -85,12 +85,12 @@ android {
     if(project.hasProperty('asfRelease')){
         //download so file if not exist, when compile in source release
         download{
-            src 
'https://git-wip-us.apache.org/repos/asf?p=incubator-weex.git;a=blob_plain;f=android/sdk/libs/armeabi/libweexcore.so;hb=refs/heads/master'
+            src 
'https://gitbox.apache.org/repos/asf?p=incubator-weex.git;a=blob_plain;f=android/sdk/libs/armeabi/libweexcore.so;hb=refs/heads/master'
             dest "${projectDir}/libs/armeabi/libweexcore.so"
             overwrite false
         }
         download{
-            src 
'https://git-wip-us.apache.org/repos/asf?p=incubator-weex.git;a=blob_plain;f=android/sdk/libs/x86/libweexcore.so;hb=refs/heads/master'
+            src 
'https://gitbox.apache.org/repos/asf?p=incubator-weex.git;a=blob_plain;f=android/sdk/libs/x86/libweexcore.so;hb=refs/heads/master'
             dest "${projectDir}/libs/x86/libweexcore.so"
             overwrite false
         }
diff --git a/scripts/build_from_source.sh b/scripts/build_from_source.sh
index ded0172d3e..2133d33b86 100755
--- a/scripts/build_from_source.sh
+++ b/scripts/build_from_source.sh
@@ -41,7 +41,7 @@ cp dist/weex-polyfill.min.js pre-build/weex-polyfill.js
 cp dist/weex-rax.min.js pre-build/weex-rax-api.js
 cp dist/weex-rax.min.js android_sdk/assets/weex-rax-api.js
 
-gradle wrapper --gradle-version 3.3
+gradle wrapper --gradle-version 4.4
 echo 'include ":android_sdk"'>settings.gradle
 ./gradlew :android_sdk:assemble -PasfRelease
 
diff --git a/scripts/generate_apache_release.sh 
b/scripts/generate_apache_release.sh
index 4a792c9001..9076513daf 100755
--- a/scripts/generate_apache_release.sh
+++ b/scripts/generate_apache_release.sh
@@ -37,3 +37,4 @@ $SED_CMD -i '' 's/\.\.\/\.\.\/pre-build/\.\.\/pre-build/g' 
$dest/android_sdk/bui
 mv $dest/android/build.gradle $dest/build.gradle
 rm -rf $dest/android $dest/ios
 
+rm -rf $dest/android_sdk/gradle
\ No newline at end of file


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services