Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read version number from build instead of hardcoding it #3412

Merged
merged 4 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package com.amazonaws.util;

import com.amazonaws.BuildConfig;
import com.amazonaws.logging.Log;
import com.amazonaws.logging.LogFactory;

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

package com.amazonaws.util;

import com.amazonaws.BuildConfig;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

Expand All @@ -24,7 +25,7 @@ public class VersionInfoUtilsTest {

@Test
public void getVersion() {
assertEquals("2.22.6", VersionInfoUtils.getVersion());
assertEquals(BuildConfig.VERSION_NAME, VersionInfoUtils.getVersion());
}

@Test
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down