Merge pull request #4287 from bmiklautz/dev2

2.0.0-dev2 - start rc2 development cycle
This commit is contained in:
akallabeth 2017-11-28 16:36:32 +01:00 committed by GitHub
commit 2f15b806f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -76,7 +76,7 @@ if ($ENV{BUILD_NUMBER})
endif()
set(WITH_LIBRARY_VERSIONING "ON")
set(RAW_VERSTION_STRING "2.0.0-rc1")
set(RAW_VERSTION_STRING "2.0.0-dev2")
if(EXISTS "${CMAKE_SOURCE_DIR}/.source_tag")
file(READ ${CMAKE_SOURCE_DIR}/.source_tag RAW_VERSTION_STRING)
elseif(USE_VERSION_FROM_GIT_TAG)

View File

@ -15,7 +15,7 @@ def getVersionName = { ->
}
ext {
versionCode = properties.get('VERSION', "11").toInteger()
versionCode = properties.get('VERSION', "12").toInteger()
minSdk = properties.get('MIN_SDK', "14").toInteger()
targetSdk = properties.get('TARGET_SDK', "25").toInteger()
compileSdk = properties.get('COMPILE_SDK', "25").toInteger()