Merge branch 'oc_beta' into 'master'

make owncloud beta app work again

See merge request !2344
This commit is contained in:
Michel Le Bihan 2017-07-02 18:43:38 +00:00
commit dffc6db895

View file

@ -1,8 +1,7 @@
Disabled:https://gitlab.com/fdroid/fdroiddata/issues/466
Categories:Internet Categories:Internet
License:GPL-2.0 License:GPL-2.0
Web Site:https://owncloud.org Web Site:https://owncloud.org
Source Code:https://github.com/owncloud/android/tree/beta Source Code:https://github.com/owncloud/android/
Issue Tracker:https://github.com/owncloud/android/issues Issue Tracker:https://github.com/owncloud/android/issues
Changelog:https://github.com/owncloud/android/blob/beta/CHANGELOG.md Changelog:https://github.com/owncloud/android/blob/beta/CHANGELOG.md
Donate:https://www.bountysource.com/teams/owncloud Donate:https://www.bountysource.com/teams/owncloud
@ -22,166 +21,16 @@ at F-Droid, too.
Repo Type:git Repo Type:git
Repo:https://github.com/owncloud/android.git Repo:https://github.com/owncloud/android.git
Build:ownCloud beta,20151125 Build:2.5.0-beta.1,20400000
commit=beta-20151125 commit=oc-android-2.5.0-beta.1
submodules=yes submodules=yes
gradle=yes output=build/outputs/apk/*.apk
srclibs=TouchImageView@v1.2.0 srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual rm=libs/disklrucache*,owncloud-android-library/libs,user_manual
prebuild=sed -i '/initWith debug/d' build.gradle
Build:ownCloud beta,20151128 build=gradle assembleBeta
commit=beta-20151128
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20151129,20151129
commit=beta-20151129
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20151130,20151130
commit=beta-20151130
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20151202,20151202
commit=beta-20151202
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20151213,20151213
commit=beta-20151213
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20151220,20151220
commit=beta-20151220
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20151222,20151222
commit=beta-20151222
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20151226,20151226
commit=beta-20151226
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20160103,20160103
commit=beta-20160103
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20160109,20160109
commit=beta-20160109
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20160120,20160120
commit=beta-20160120
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20160124,20160124
disable=invalid apk
commit=beta-20160124
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20160201,20160201
disable=invalid apk
commit=beta-20160201
submodules=yes
gradle=yes
srclibs=TouchImageView@v1.2.0
rm=libs/disklrucache*,libs/android-support*,owncloud-android-library/libs,user_manual
Build:20160206,20160206
disable=invalid apk: ERROR getting 'android:label' attribute: attribute is not a string value
commit=beta-20160206
submodules=yes
gradle=yes
Build:20160305,20160305
disable=fails
commit=beta-20160305
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Build:20160313,20160313
disable=fails
commit=beta-20160313
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Build:20160317,20160317
disable=fails
commit=beta-20160317
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Build:20160321,20160321
disable=fails
commit=beta-20160321
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Build:20160410,20160410
commit=beta-20160410
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Build:20160419,20160419
disable=broken submodule
commit=beta-20160419
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Build:20160427,20160427
commit=beta-20160427
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Build:20160606,20160606
commit=beta-20160606
submodules=yes
gradle=yes
rm=user_manual/ocdoc/win32/wget.exe
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:RepoManifest
Current Version:20160606 Current Version:2.5.0-beta.1
Current Version Code:20160606 Current Version Code:20400000