Merge branch 'update_oc_newsreader' into 'master'

Update ownCloud News Reader to 0.8.4 (76)

Build, install and functionality tested.

Also build the SnowcaseView-5.1.0-SNAPSHOT from upstreams subproject instead of using the ShowcaseView-5.0.0 from Maven Central. Have seen some crashs with the App and one is re-produceable on the f-droid build but it doesn't crash on the upstreams .apk. This is also not happening anymore on the f-droid build when using the snapshot.

```
E/AndroidRuntime( 1549): FATAL EXCEPTION: main
E/AndroidRuntime( 1549): Process: de.luhmer.owncloudnewsreader, PID: 1549
E/AndroidRuntime( 1549): java.lang.NullPointerException
E/AndroidRuntime( 1549): 	at com.github.amlcurran.showcaseview.StandardShowcaseDrawer.erase(StandardShowcaseDrawer.java:75)
E/AndroidRuntime( 1549): 	at com.github.amlcurran.showcaseview.ShowcaseView.dispatchDraw(ShowcaseView.java:246)
E/AndroidRuntime( 1549): 	at android.view.View.draw(View.java:14348)
E/AndroidRuntime( 1549): 	at android.view.ViewGroup.drawChild(ViewGroup.java:3103)
E/AndroidRuntime( 1549): 	at android.view.ViewGroup.dispatchDraw(ViewGroup.java:2940)
E/AndroidRuntime( 1549): 	at android.view.View.draw(View.java:14468)
E/AndroidRuntime( 1549): 	at android.widget.FrameLayout.draw(FrameLayout.java:472)
E/AndroidRuntime( 1549): 	at com.android.internal.policy.impl.PhoneWindow$DecorView.draw(PhoneWindow.java:2326)
E/AndroidRuntime( 1549): 	at android.view.ViewRootImpl.drawSoftware(ViewRootImpl.java:2496)
E/AndroidRuntime( 1549): 	at android.view.ViewRootImpl.draw(ViewRootImpl.java:2409)
E/AndroidRuntime( 1549): 	at android.view.ViewRootImpl.performDraw(ViewRootImpl.java:2253)
E/AndroidRuntime( 1549): 	at android.view.ViewRootImpl.performTraversals(ViewRootImpl.java:1883)
E/AndroidRuntime( 1549): 	at android.view.ViewRootImpl.doTraversal(ViewRootImpl.java:1000)
E/AndroidRuntime( 1549): 	at android.view.ViewRootImpl$TraversalRunnable.run(ViewRootImpl.java:5670)
E/AndroidRuntime( 1549): 	at android.view.Choreographer$CallbackRecord.run(Choreographer.java:761)
E/AndroidRuntime( 1549): 	at android.view.Choreographer.doCallbacks(Choreographer.java:574)
E/AndroidRuntime( 1549): 	at android.view.Choreographer.doFrame(Choreographer.java:544)
E/AndroidRuntime( 1549): 	at android.view.Choreographer$FrameDisplayEventReceiver.run(Choreographer.java:747)
E/AndroidRuntime( 1549): 	at android.os.Handler.handleCallback(Handler.java:733)
E/AndroidRuntime( 1549): 	at android.os.Handler.dispatchMessage(Handler.java:95)
E/AndroidRuntime( 1549): 	at android.os.Looper.loop(Looper.java:136)
E/AndroidRuntime( 1549): 	at android.app.ActivityThread.main(ActivityThread.java:5017)
E/AndroidRuntime( 1549): 	at java.lang.reflect.Method.invokeNative(Native Method)
E/AndroidRuntime( 1549): 	at java.lang.reflect.Method.invoke(Method.java:515)
E/AndroidRuntime( 1549): 	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:779)
E/AndroidRuntime( 1549): 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:595)
E/AndroidRuntime( 1549): 	at dalvik.system.NativeStart.main(Native Method)
W/ActivityManager(  379):   Force finishing activity de.luhmer.owncloudnewsreader/.NewsReaderListActivity
```

See merge request !507
This commit is contained in:
Boris Kraut 2015-01-18 11:11:57 +00:00
commit 7dcde4ac50

View file

@ -196,6 +196,20 @@ Build:0.8.3,75
sed -i -e '/MIN_SDK/d' ../gradle.properties && \
echo -e "\nANDROID_BUILD_MIN_SDK_VERSION=11\nMIN_SDK=11" >> ../gradle.properties
Build:0.8.4,76
commit=dfc4bf861675d44fe25ad5116655584be1a7be1f
subdir=News-Android-App
submodules=yes
init=sed -i -e '/ANDROID_BUILD_TOOLS_VERSION/d' -e '/ANDROID_BUILD_SDK_VERSION/abuildToolsVersion "21"' build.gradle ../ownCloud-Account-Importer/build.gradle ../MessageBar/build.gradle ../Changeloglib/ChangeLogLibrary/build.gradle && \
sed -i 's;BUILD_TOOLS_VERSION;"21";' ../ShowcaseView/library/build.gradle && \
sed -i 's/runProguard false/minifyEnabled false/g' ../ownCloud-Account-Importer/build.gradle
gradle=yes
rm=News-Android-App/src/main/libs/*jar
prebuild=sed -i -e '/src\/main\/libs/d' build.gradle && \
sed -i -e "/freemarker/acompile 'org.jsoup:jsoup:1.7.2'\ncompile 'com.google.code.gson:gson:2.2.4'" build.gradle && \
sed -i -e '/MIN_SDK/d' ../gradle.properties && \
echo -e "\nANDROID_BUILD_MIN_SDK_VERSION=11\nMIN_SDK=11" >> ../gradle.properties
Maintainer Notes:
Releases are usually (not always) tagged. Tag names are erratic. Switch back
to RepoManifest.