Merge branch 'GnuCash' into 'master'

Update GnuCash to 1.6.3 (16300)

See merge request !918
This commit is contained in:
أحمد المحمودي 2015-08-11 10:57:55 +00:00
commit 4a178500d8

View file

@ -241,8 +241,41 @@ Build:1.6.2,16200
sed -i -e "/MPAndroidChart/d" build.gradle && \ sed -i -e "/MPAndroidChart/d" build.gradle && \
sed -i -e '/variant.outputs.each/,/ }/ d' build.gradle sed -i -e '/variant.outputs.each/,/ }/ d' build.gradle
Build:1.6.3,16300
commit=v1.6.3
subdir=app
gradle=production
target=android-19
rm=app/libs/*.jar;app/src/main/jniLibs/*/*
patch=disable_gms_dropbox.diff
srclibs=CWACMerge@v1.1.1,CWACSacklist@v1.0.2,MPAndroidChart@v2.1.0,ViewPagerIndicator@2.4.1
prebuild=sed -e "/\<Crashlytics\>/ d" -i `grep -lr "\<Crashlytics\>" src/main/java/` && \
sed -e "/crashlytics/ d" -i build.gradle ../build.gradle && \
sed -e "/USE_CRASHLYTICS/ d" -i src/main/java/org/gnucash/android/app/GnuCashApplication.java build.gradle && \
sed -e "/gms/ d" -i build.gradle && \
sed -e "/cwac/ d" -i build.gradle && \
sed -e "/maven\s*{\s*url.*}/ d" -i ../build.gradle && \
sed -e "/<item>\(Drop\|Google\)/ d" -i src/main/res/values*/strings.xml && \
cp -fR $$CWACMerge$$/merge/src/com src/main/java/ && \
cp -fR $$CWACSacklist$$/sacklist/src/com src/main/java/ && \
cp -fR $$MPAndroidChart$$/src/com/ src/main/java/ && \
cp -fR $$ViewPagerIndicator$$ ../ViewPagerIndicator && \
rm -f ../ViewPagerIndicator/libs/*.jar && \
echo "include ':ViewPagerIndicator'" >> ../settings.gradle && \
echo -e "apply plugin: 'com.android.library' \
\nandroid { compileSdkVersion 21 \n buildToolsVersion \"22.0.1\"" > ../ViewPagerIndicator/build.gradle && \
echo -e "lintOptions.abortOnError = false \
\n sourceSets{main{ \
\n manifest.srcFile 'AndroidManifest.xml' \
\n java.srcDirs = ['src'] \
\n res.srcDirs = ['res'] }}} \
\n dependencies {compile 'com.android.support:support-v4:22.1.1'}" >> ../ViewPagerIndicator/build.gradle && \
sed -i -e "s/.*viewpagerindicator.*/project(':ViewPagerIndicator'),/" build.gradle && \
sed -i -e "/MPAndroidChart/d" build.gradle && \
sed -i -e '/variant.outputs.each/,/ }/ d' build.gradle
#Auto Update Mode:Version v%v #Auto Update Mode:Version v%v
Update Check Mode:Tags v[0-9.]* Update Check Mode:Tags v[0-9.]*
Current Version:1.6.2 Current Version:1.6.3
Current Version Code:16200 Current Version Code:16300