Merge pull request #846 from Microsoft/fix/some-warns

Update Android gradle plugin and fix a Javadoc warning
microsoft · Oct 17, 2018 · 7e7b72f · 7e7b72f
2 parents 13e9a82 + bb0336b
commit 7e7b72f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.google.gms:google-services:4.0.1'

diff --git a/sdk/appcenter/src/main/java/com/microsoft/appcenter/ingestion/OneCollectorIngestion.java b/sdk/appcenter/src/main/java/com/microsoft/appcenter/ingestion/OneCollectorIngestion.java
@@ -34,7 +34,6 @@
 
 import static android.util.Log.VERBOSE;
 import static com.microsoft.appcenter.AppCenter.LOG_TAG;
-import static com.microsoft.appcenter.BuildConfig.VERSION_NAME;
 import static com.microsoft.appcenter.http.DefaultHttpClient.CONTENT_TYPE_KEY;
 import static com.microsoft.appcenter.http.DefaultHttpClient.METHOD_POST;
 
@@ -166,8 +165,9 @@ public ServiceCall sendAsync(String appSecret, UUID installId, LogContainer logC
         /* Content type. */
         headers.put(CONTENT_TYPE_KEY, CONTENT_TYPE_VALUE);
 
-        /* Client version */
-        headers.put(CLIENT_VERSION_KEY, String.format(CLIENT_VERSION_FORMAT, VERSION_NAME));
+        /* Client version (no import to avoid Javadoc issue). */
+        String sdkVersion = com.microsoft.appcenter.BuildConfig.VERSION_NAME;
+        headers.put(CLIENT_VERSION_KEY, String.format(CLIENT_VERSION_FORMAT, sdkVersion));
 
         /* Upload time */
         headers.put(UPLOAD_TIME_KEY, String.valueOf(System.currentTimeMillis()));