Merge branch 'master' into 'master'
updated trikita.obsqr information, added 3.0 release Trikita Obsqr has been added to F-Droid long time ago, it was located on bitbucket then. Now it's moved to github and got some improvements. Since Gradle still doesn't work well with NDK (and probably never will), we've decided to keep prebuilt zbar libraries in the source tree to simplify local builds, tests and CI on Travis. Unfortunately, this means that prebuilt zbar libraries are to be excluded from checks. I don't know if it's technically possible to build zbar separately and ensure that Obsqr is built from pure sources. I tried using prebuild command, but my build failed, so I ended up just excluding those `*.so` files for now, sorry. See merge request !1467
This commit is contained in:
commit
d9317db5e0
|
@ -1,8 +1,8 @@
|
|||
Categories:System
|
||||
License:MIT
|
||||
Web Site:http://trikita.co/#obsqr
|
||||
Source Code:https://bitbucket.org/trikita/obsqr/src
|
||||
Issue Tracker:https://bitbucket.org/trikita/obsqr/issues?status=new&status=open
|
||||
Web Site:http://trikita.co/
|
||||
Source Code:https://github.com/trikita/obsqr
|
||||
Issue Tracker:https://github.com/trikita/obsqr/issues
|
||||
|
||||
Auto Name:Obsqr
|
||||
Summary:QR code scanner
|
||||
|
@ -13,8 +13,8 @@ allows you to access QR content with a single tap.
|
|||
'''N.B''' QR codes only, not other kinds of barcodes.
|
||||
.
|
||||
|
||||
Repo Type:hg
|
||||
Repo:https://bitbucket.org/trikita/obsqr
|
||||
Repo Type:git
|
||||
Repo:https://github.com/trikita/obsqr
|
||||
|
||||
Build:2.4,9
|
||||
commit=071341595ce3
|
||||
|
@ -39,7 +39,12 @@ Build:2.7,13
|
|||
gradle=fat
|
||||
prebuild=sed -i -e 's/buildTypes.release.signingConfig/android.buildTypes.release.signingConfig/g' build.gradle
|
||||
|
||||
Auto Update Mode:None
|
||||
Build:3.0,16
|
||||
commit=3.0
|
||||
gradle=zbar
|
||||
scanignore=src/zbar/jniLibs
|
||||
|
||||
Auto Update Mode:Version %v
|
||||
Update Check Mode:Tags
|
||||
Current Version:2.7
|
||||
Current Version Code:13
|
||||
Current Version:3.0
|
||||
Current Version Code:16
|
||||
|
|
Loading…
Reference in a new issue