diff options
| author | Joey Grover <joeygrover@gmail.com> | 2018-03-12 15:45:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 15:45:03 -0400 |
| commit | 0bf0067c0e8b0f15a211705f7bc35ed20463c76e (patch) | |
| tree | a190a76801858549c4160a2518c7049479611364 | |
| parent | 1d5aac573895ae6a9eee0f298fb521391e5d596d (diff) | |
| parent | 7e1fc39745e9c358a0a0b615f6e83e72a510187b (diff) | |
| download | sdl_android-0bf0067c0e8b0f15a211705f7bc35ed20463c76e.tar.gz | |
Merge pull request #704 from smartdevicelink/feature/issue_703
#703 Logging library version
| -rw-r--r-- | sdl_android/build.gradle | 1 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 2 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/sdl_android/build.gradle b/sdl_android/build.gradle index 843dd2af0..9ffc17410 100644 --- a/sdl_android/build.gradle +++ b/sdl_android/build.gradle @@ -9,6 +9,7 @@ android { versionCode 2 versionName "4.3.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"' } buildTypes { release { diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index fffeb4525..3078b9bb7 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -41,6 +41,7 @@ import android.view.Display; import android.view.MotionEvent;
import android.view.Surface;
+import com.smartdevicelink.BuildConfig;
import com.smartdevicelink.Dispatcher.IDispatchingStrategy;
import com.smartdevicelink.Dispatcher.ProxyMessageDispatcher;
import com.smartdevicelink.SdlConnection.ISdlConnectionListener;
@@ -594,6 +595,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> String autoActivateID, boolean callbackToUIThread, Boolean preRegister, String sHashID, Boolean bAppResumeEnab,
BaseTransportConfig transportConfig) throws SdlException
{
+ Log.i(TAG, "SDL_LIB_VERSION: " + Version.VERSION);
setWiProVersion((byte)PROX_PROT_VER_ONE);
if (preRegister != null && preRegister)
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java index 214792f85..d49d979fe 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/Version.java @@ -1,5 +1,7 @@ package com.smartdevicelink.proxy;
+import com.smartdevicelink.BuildConfig;
+
public class Version {
- public static final String VERSION = "VERSION-INFO";
+ public static final String VERSION = BuildConfig.VERSION_NAME;
}
|