Revert workarounds for platform-27 and Gradle 4.3.1

Now that buildserver is redeployed, they are not needed. Revert f776928,
1e1bb78 and 8530cd9.
This commit is contained in:
relan 2017-12-02 09:37:42 +03:00
parent ae955cfdfa
commit 84f0bbafed
2 changed files with 1 additions and 13 deletions

View file

@ -581,11 +581,7 @@ Build:0.10.0-beta3,4131
Build:0.10.0,4133 Build:0.10.0,4133
commit=0.10.0 commit=0.10.0
submodules=yes submodules=yes
sudo=apt-get install -y golang-go/jessie-backports golang-src/jessie-backports && \ sudo=apt-get install -y golang-go/jessie-backports golang-src/jessie-backports
chown vagrant:vagrant /opt/gradle/versions
init=wget -q https://downloads.gradle.org/distributions/gradle-4.3.1-bin.zip && \
unzip -qq gradle-4.3.1-bin.zip && \
mv gradle-4.3.1 /opt/gradle/versions/4.3.1
gradle=yes gradle=yes
output=app/build/outputs/apk/app-release-unsigned.apk output=app/build/outputs/apk/app-release-unsigned.apk
ndk=r15c ndk=r15c

View file

@ -568,10 +568,6 @@ Build:4.1.0,260
commit=v4.1.0 commit=v4.1.0
subdir=app subdir=app
submodules=yes submodules=yes
sudo=. /etc/profile.d/bsenv.sh && \
echo -e '\nd56f5187479451eabf01fb78af6dfcb131a6481e' > $ANDROID_HOME/licenses/android-sdk-license && \
chgrp vagrant $ANDROID_HOME/platforms && \
chmod g+w $ANDROID_HOME/platforms
init=sed -i -e 's/signingConfig signingConfigs.release/{}/g' build.gradle && \ init=sed -i -e 's/signingConfig signingConfigs.release/{}/g' build.gradle && \
rm ../gradle.properties rm ../gradle.properties
gradle=basic gradle=basic
@ -583,10 +579,6 @@ Build:4.1.1,270
commit=v4.1.1 commit=v4.1.1
subdir=app subdir=app
submodules=yes submodules=yes
sudo=. /etc/profile.d/bsenv.sh && \
echo -e '\nd56f5187479451eabf01fb78af6dfcb131a6481e' > $ANDROID_HOME/licenses/android-sdk-license && \
chgrp vagrant $ANDROID_HOME/platforms && \
chmod g+w $ANDROID_HOME/platforms
init=sed -i -e 's/signingConfig signingConfigs.release/{}/g' build.gradle && \ init=sed -i -e 's/signingConfig signingConfigs.release/{}/g' build.gradle && \
rm ../gradle.properties rm ../gradle.properties
gradle=basic gradle=basic