Read version number from build instead of hardcoding it (#3412)

* Read version number from build instead of hardcoding it

* Also re-enable build config

* Fix test

* empty commit to retrigger tests

---------

Co-authored-by: Thomas Leing <[email protected]>

Author: tjleing

aws-android-sdk-core/src/main/java/com/amazonaws/util/VersionInfoUtils.java

@@ -15,6 +15,7 @@
 
 package com.amazonaws.util;
 
+import com.amazonaws.BuildConfig;
 import com.amazonaws.logging.Log;
 import com.amazonaws.logging.LogFactory;
 
@@ -26,7 +27,7 @@ public class VersionInfoUtils {
     private static final int DEFAULT_STRING_LENGTH = 128;
 
     /** SDK version info */
-    private static volatile String version = "2.22.6";
+    private static volatile String version = BuildConfig.VERSION_NAME;
                                                                 // changed build
                                                                 // logic
 

aws-android-sdk-core/src/test/java/com/amazonaws/util/VersionInfoUtilsTest.java

@@ -15,6 +15,7 @@
 
 package com.amazonaws.util;
 
+import com.amazonaws.BuildConfig;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -24,7 +25,7 @@ public class VersionInfoUtilsTest {
 
     @Test
     public void getVersion() {
-        assertEquals("2.22.6", VersionInfoUtils.getVersion());
+        assertEquals(BuildConfig.VERSION_NAME, VersionInfoUtils.getVersion());
     }
 
     @Test

gradle.properties

@@ -14,7 +14,6 @@ org.gradle.jvmargs=-Xmx1536m
 
 # Disable Gradle Android plugin features.
 # Reference: https://developer.android.com/studio/releases/gradle-plugin#4-0-0-new
-android.defaults.buildfeatures.buildconfig=false
 android.defaults.buildfeatures.aidl=false
 android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.resvalues=false