Commit 29339bc0 authored by ylecollen's avatar ylecollen
Browse files

Update getSdkOlmVersion to provide the git commit

parent a14bf30c
...@@ -15,7 +15,17 @@ android { ...@@ -15,7 +15,17 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
debug {
resValue "string", "git_olm_revision", "\"${gitRevision()}\""
resValue "string", "git_olm_revision_unix_date", "\"${gitRevisionUnixDate()}\""
resValue "string", "git_olm_revision_date", "\"${gitRevisionDate()}\""
}
release { release {
resValue "string", "git_olm_revision", "\"${gitRevision()}\""
resValue "string", "git_olm_revision_unix_date", "\"${gitRevisionUnixDate()}\""
resValue "string", "git_olm_revision_date", "\"${gitRevisionDate()}\""
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
...@@ -93,6 +103,21 @@ def getNdkBuildCmd() { ...@@ -93,6 +103,21 @@ def getNdkBuildCmd() {
return ndkBuildCmd return ndkBuildCmd
} }
def gitRevision() {
def cmd = "git rev-parse --short HEAD"
return cmd.execute().text.trim()
}
def gitRevisionUnixDate() {
def cmd = "git show -s --format=%ct HEAD^{commit}"
return cmd.execute().text.trim()
}
def gitRevisionDate() {
def cmd = "git show -s --format=%ci HEAD^{commit}"
return cmd.execute().text.trim()
}
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:21.+' compile 'com.android.support:appcompat-v7:21.+'
......
...@@ -65,7 +65,7 @@ public class OlmAccountTest { ...@@ -65,7 +65,7 @@ public class OlmAccountTest {
String olmLibVersion = mOlmManager.getOlmLibVersion(); String olmLibVersion = mOlmManager.getOlmLibVersion();
assertNotNull(olmLibVersion); assertNotNull(olmLibVersion);
String olmSdkVersion = mOlmManager.getSdkOlmVersion(); String olmSdkVersion = mOlmManager.getSdkOlmVersion(getInstrumentation().getContext());
assertNotNull(olmLibVersion); assertNotNull(olmLibVersion);
Log.d(LOG_TAG, "## setUpClass(): Versions - Android Olm SDK = "+olmSdkVersion+" Olm lib ="+olmLibVersion); Log.d(LOG_TAG, "## setUpClass(): Versions - Android Olm SDK = "+olmSdkVersion+" Olm lib ="+olmLibVersion);
} }
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.matrix.olm; package org.matrix.olm;
import android.content.Context;
import android.util.Log; import android.util.Log;
/** /**
...@@ -25,7 +26,6 @@ import android.util.Log; ...@@ -25,7 +26,6 @@ import android.util.Log;
*/ */
public class OlmManager { public class OlmManager {
private static final String LOG_TAG = "OlmManager"; private static final String LOG_TAG = "OlmManager";
private static final String SDK_OLM_VERSION = "V0.1.0_1";
/** /**
* Constructor. * Constructor.
...@@ -41,8 +41,15 @@ public class OlmManager { ...@@ -41,8 +41,15 @@ public class OlmManager {
} }
} }
public String getSdkOlmVersion() { /**
return SDK_OLM_VERSION; * 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;
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment