Merge branch 'master' into 'master'
RunnerUp: fix build for 1.51 and reenable See merge request !1045
This commit is contained in:
commit
5bb63dac73
|
@ -113,7 +113,6 @@ Build:1.50,14000050
|
|||
sed -i -E "s/minifyEnabled true/minifyEnabled false/" build.gradle
|
||||
|
||||
Build:1.51,14000051
|
||||
disable=malformed XML
|
||||
commit=v1.51
|
||||
subdir=app
|
||||
submodules=yes
|
||||
|
@ -121,7 +120,7 @@ Build:1.51,14000051
|
|||
rm=wear
|
||||
prebuild=sed -i "/latestCompile 'com.google.android.gms:play-services/d" build.gradle && \
|
||||
sed -i "/latestWearApp project(':wear')/d" build.gradle && \
|
||||
sed -i "/com.google.android.gms.version/,+2d" latest/AndroidManifest.xml && \
|
||||
sed -i "/com.google.android.gms.version/,+1d" latest/AndroidManifest.xml && \
|
||||
cp froyo/java/org/runnerup/tracker/component/TrackerWear.java latest/java/org/runnerup/tracker/component/ && \
|
||||
cp froyo/java/org/runnerup/widget/AboutPreference.java latest/java/org/runnerup/widget/ && \
|
||||
sed -i -E "s/shrinkResources true/shrinkResources false/" build.gradle && \
|
||||
|
|
Loading…
Reference in a new issue