missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'GnuCash' into 'master'

Browse source 
Update GnuCash to 1.6.1 (16100)

See merge request !870
This commit is contained in:
Boris Kraut 2015-07-15 13:12:45 +00:00
parent dc8c4b8085 b1f7e8e163
commit 6f6c1c1989
2 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
metadata/org.gnucash.android.txt
View file

@ -156,6 +156,40 @@ Build:1.6.0,16006
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
Build:1.6.1,16100
commit=v1.6.1
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/ && \
@ -176,6 +210,6 @@ Build:1.6.0,16006
#Auto Update Mode:Version v%v
Update Check Mode:Tags v[0-9.]*
Current Version:1.6.0
Current Version Code:16006
Current Version:1.6.1
Current Version Code:16100

10
metadata/org.gnucash.android/disable_gms_dropbox.diff
View file

@ -472,6 +472,16 @@ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3448ead..4090d50 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,9 +43,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"
android:label="Schedule repeating transactions when device is rebooted"/>
- <uses-permission android:name="android.permission.INTERNET"
- android:label="Export and backup to 3rd party hosting services" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application android:name="org.gnucash.android.app.GnuCashApplication"
android:icon="@drawable/ic_launcher"
@@ -100,24 +100,6 @@
<activity android:name=".ui.chart.PieChartActivity" />
<activity android:name=".ui.chart.LineChartActivity" />