smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #452 from kiwix/version-update 

Bump-up version (and libzim required version)
This commit is contained in:
Kelson 2021-02-08 21:30:11 +01:00 committed by GitHub
parent c70c370ae0 b1689e0d3c
commit c9bc2b48b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
View File

@ -26,7 +26,7 @@ task writePom {
project { project {
groupId 'org.kiwix.kiwixlib' groupId 'org.kiwix.kiwixlib'
artifactId 'kiwixlib' artifactId 'kiwixlib'
version '9.4.1' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION) version '9.5.0' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
packaging 'aar' packaging 'aar'
name 'kiwixlib' name 'kiwixlib'
url 'https://github.com/kiwix/kiwix-lib' url 'https://github.com/kiwix/kiwix-lib'

4
meson.build
View File

@ -1,5 +1,5 @@
project('kiwix-lib', 'cpp', project('kiwix-lib', 'cpp',
version : '9.4.1', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle version : '9.5.0', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
license : 'GPLv3+', license : 'GPLv3+',
default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])
@ -43,7 +43,7 @@ else
error('Cannot found header mustache.hpp') error('Cannot found header mustache.hpp')
endif endif
libzim_dep = dependency('libzim', version : '>=6.3.0', static:static_deps) libzim_dep = dependency('libzim', version : '>=7.0.0', static:static_deps)
if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN') if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
error('Libzim seems to be compiled without xapian. Xapian support is mandatory.') error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
endif endif