Android : improve the version number management (#46)
Add functions to make the difference between the native and the java code version. Factor out the version management in the makefiles.
This commit is contained in:
parent
77eaaa3d5f
commit
a9aeb6b5d7
6 changed files with 26 additions and 15 deletions
4
Makefile
4
Makefile
|
@ -1,8 +1,6 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
MAJOR := 2
|
||||
MINOR := 2
|
||||
PATCH := 2
|
||||
include common.mk
|
||||
VERSION := $(MAJOR).$(MINOR).$(PATCH)
|
||||
PREFIX ?= /usr/local
|
||||
BUILD_DIR := build
|
||||
|
|
|
@ -49,7 +49,7 @@ To build the Xcode workspace for Objective-C bindings, run:
|
|||
Release process
|
||||
---------------
|
||||
|
||||
First: bump version numbers in ``Makefile``, ``javascript/package.json``,
|
||||
First: bump version numbers in ``common.mk``, ``javascript/package.json``,
|
||||
``OLMKit.podspec``, and ``android/olm-sdk/build.gradle`` (``versionCode``,
|
||||
``versionName`` and ``version``).
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ public class OlmAccountTest {
|
|||
|
||||
String olmLibVersion = mOlmManager.getOlmLibVersion();
|
||||
assertNotNull(olmLibVersion);
|
||||
String olmSdkVersion = mOlmManager.getSdkOlmVersion(getInstrumentation().getContext());
|
||||
String olmSdkVersion = mOlmManager.getDetailedVersion(getInstrumentation().getContext());
|
||||
assertNotNull(olmLibVersion);
|
||||
Log.d(LOG_TAG, "## setUpClass(): Versions - Android Olm SDK = "+olmSdkVersion+" Olm lib ="+olmLibVersion);
|
||||
}
|
||||
|
|
|
@ -43,17 +43,26 @@ public class OlmManager {
|
|||
|
||||
/**
|
||||
* Provide the android library version
|
||||
* @param context the context
|
||||
* @return the library version
|
||||
*/
|
||||
public String getSdkOlmVersion(Context context) {
|
||||
String gitVersion = context.getResources().getString(R.string.git_olm_revision);
|
||||
String date = context.getResources().getString(R.string.git_olm_revision_date);
|
||||
return gitVersion + "-" + date;
|
||||
public String getVersion() {
|
||||
return BuildConfig.VERSION_NAME;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the OLM lib version.
|
||||
* Provide a detailed version.
|
||||
* It contains the android and the native libraries versions.
|
||||
* @param context the context
|
||||
* @return the detailed version
|
||||
*/
|
||||
public String getDetailedVersion(Context context) {
|
||||
String gitVersion = context.getResources().getString(R.string.git_olm_revision);
|
||||
String date = context.getResources().getString(R.string.git_olm_revision_date);
|
||||
return getVersion() + " - olm version (" + getOlmLibVersion() + ") - " + gitVersion + "-" + date;
|
||||
}
|
||||
|
||||
/**
|
||||
* Provide the native OLM lib version.
|
||||
* @return the lib version as a string
|
||||
*/
|
||||
public String getOlmLibVersion(){
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := olm
|
||||
MAJOR := 2
|
||||
MINOR := 0
|
||||
PATCH := 0
|
||||
include ../../../../common.mk
|
||||
OLM_VERSION := $(MAJOR).$(MINOR).$(PATCH)
|
||||
|
||||
LOCAL_MODULE := olm
|
||||
|
||||
SRC_ROOT_DIR := ../../../../..
|
||||
|
||||
$(info LOCAL_PATH=$(LOCAL_PATH))
|
||||
|
|
4
common.mk
Normal file
4
common.mk
Normal file
|
@ -0,0 +1,4 @@
|
|||
|
||||
MAJOR := 2
|
||||
MINOR := 2
|
||||
PATCH := 2
|
Loading…
Reference in a new issue