mirrors
/
olm
mirror of https://git.matrix.org/git/olm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
poljar/cmake_sas
Yannick LE COLLEN 2017-03-02 13:01:32 +01:00 committed by Richard van der Hoff
parent 77eaaa3d5f
commit a9aeb6b5d7
6 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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

2
README.rst
View File

@ -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``).

2
android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
View File

@ -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);
}

21
android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
View File

@ -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(){

8
android/olm-sdk/src/main/jni/Android.mk
View File

@ -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
View File

@ -0,0 +1,4 @@
MAJOR := 2
MINOR := 2
PATCH := 2