From b49be10bd8f6175ae86f68705c3d44a46a1d6649 Mon Sep 17 00:00:00 2001
From: Richard McClellan <ricmccle@amazon.com>
Date: Fri, 11 Sep 2020 17:45:11 -0500
Subject: [PATCH] Move versionName and versionCode from module build files to
 project build file

---
 aws-android-sdk-apigateway-core/build.gradle      |  2 --
 aws-android-sdk-apigateway-test/build.gradle      |  2 --
 aws-android-sdk-auth-core/build.gradle            |  2 --
 aws-android-sdk-auth-facebook/build.gradle        |  2 --
 aws-android-sdk-auth-google/build.gradle          |  2 --
 aws-android-sdk-auth-ui/build.gradle              |  2 --
 aws-android-sdk-auth-userpools/build.gradle       |  2 --
 aws-android-sdk-cloudwatch/build.gradle           |  2 --
 aws-android-sdk-cognito/build.gradle              |  2 --
 aws-android-sdk-cognitoauth/build.gradle          |  2 --
 .../build.gradle                                  |  2 --
 .../build.gradle                                  |  2 --
 aws-android-sdk-comprehend/build.gradle           |  2 --
 aws-android-sdk-connect/build.gradle              |  2 --
 aws-android-sdk-connectparticipant/build.gradle   |  2 --
 aws-android-sdk-core-test/build.gradle            |  3 ---
 aws-android-sdk-core/build.gradle                 |  2 --
 aws-android-sdk-ddb-document/build.gradle         |  2 --
 aws-android-sdk-ddb-mapper/build.gradle           |  2 --
 aws-android-sdk-ddb/build.gradle                  |  2 --
 aws-android-sdk-ec2/build.gradle                  |  2 --
 aws-android-sdk-iot-test/build.gradle             |  2 --
 aws-android-sdk-iot/build.gradle                  |  2 --
 aws-android-sdk-kinesis/build.gradle              |  2 --
 .../build.gradle                                  |  2 --
 .../build.gradle                                  |  2 --
 aws-android-sdk-kinesisvideo/build.gradle         |  2 --
 aws-android-sdk-kms/build.gradle                  |  2 --
 aws-android-sdk-lambda/build.gradle               |  2 --
 aws-android-sdk-lex/build.gradle                  |  2 --
 aws-android-sdk-logs/build.gradle                 |  2 --
 aws-android-sdk-machinelearning/build.gradle      |  2 --
 aws-android-sdk-mobile-client/build.gradle        |  2 --
 aws-android-sdk-mobileanalytics/build.gradle      |  2 --
 aws-android-sdk-pinpoint-test/build.gradle        |  2 --
 aws-android-sdk-pinpoint/build.gradle             |  2 --
 aws-android-sdk-polly/build.gradle                |  2 --
 aws-android-sdk-rekognition/build.gradle          |  2 --
 aws-android-sdk-s3-test/build.gradle              |  2 --
 aws-android-sdk-s3/build.gradle                   |  2 --
 aws-android-sdk-sagemaker-runtime/build.gradle    |  2 --
 aws-android-sdk-sdb/build.gradle                  |  2 --
 aws-android-sdk-ses/build.gradle                  |  2 --
 aws-android-sdk-sns/build.gradle                  |  2 --
 aws-android-sdk-sqs/build.gradle                  |  2 --
 aws-android-sdk-testutils/build.gradle            |  2 --
 aws-android-sdk-textract/build.gradle             |  2 --
 aws-android-sdk-transcribe/build.gradle           |  2 --
 aws-android-sdk-translate/build.gradle            |  2 --
 build.gradle                                      | 15 +++++++++++++++
 gradle.properties                                 |  3 ++-
 51 files changed, 17 insertions(+), 100 deletions(-)

diff --git a/aws-android-sdk-apigateway-core/build.gradle b/aws-android-sdk-apigateway-core/build.gradle
index e13dd6d0d4..c8b1fc970f 100644
--- a/aws-android-sdk-apigateway-core/build.gradle
+++ b/aws-android-sdk-apigateway-core/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-apigateway-test/build.gradle b/aws-android-sdk-apigateway-test/build.gradle
index 2329bf20a5..4684276b22 100644
--- a/aws-android-sdk-apigateway-test/build.gradle
+++ b/aws-android-sdk-apigateway-test/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 }
diff --git a/aws-android-sdk-auth-core/build.gradle b/aws-android-sdk-auth-core/build.gradle
index 7dcf4673f8..09efda6e79 100644
--- a/aws-android-sdk-auth-core/build.gradle
+++ b/aws-android-sdk-auth-core/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-auth-facebook/build.gradle b/aws-android-sdk-auth-facebook/build.gradle
index eeb4810760..c91671ea92 100644
--- a/aws-android-sdk-auth-facebook/build.gradle
+++ b/aws-android-sdk-auth-facebook/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // v4 support, brought from facebook sdk
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-auth-google/build.gradle b/aws-android-sdk-auth-google/build.gradle
index 10bab2485d..8d28024ad5 100644
--- a/aws-android-sdk-auth-google/build.gradle
+++ b/aws-android-sdk-auth-google/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // gms auth brought by google sdk
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-auth-ui/build.gradle b/aws-android-sdk-auth-ui/build.gradle
index 6a1b0294fa..fe92835874 100644
--- a/aws-android-sdk-auth-ui/build.gradle
+++ b/aws-android-sdk-auth-ui/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // appcompat
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-auth-userpools/build.gradle b/aws-android-sdk-auth-userpools/build.gradle
index a86ddaf71f..9a9bbe0662 100644
--- a/aws-android-sdk-auth-userpools/build.gradle
+++ b/aws-android-sdk-auth-userpools/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // setAllCaps(), 11 otherwise
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-cloudwatch/build.gradle b/aws-android-sdk-cloudwatch/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-cloudwatch/build.gradle
+++ b/aws-android-sdk-cloudwatch/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-cognito/build.gradle b/aws-android-sdk-cognito/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-cognito/build.gradle
+++ b/aws-android-sdk-cognito/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-cognitoauth/build.gradle b/aws-android-sdk-cognitoauth/build.gradle
index 32a539925a..51c99ba3ad 100644
--- a/aws-android-sdk-cognitoauth/build.gradle
+++ b/aws-android-sdk-cognitoauth/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 16 // androidx.browser
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
 
         manifestPlaceholders = [
                 'authRedirectScheme': 'FOR_LIBRARY_CONSUMER_TO_OVERRIDE'
diff --git a/aws-android-sdk-cognitoidentityprovider-test/build.gradle b/aws-android-sdk-cognitoidentityprovider-test/build.gradle
index 52a1b795d3..0469403e33 100644
--- a/aws-android-sdk-cognitoidentityprovider-test/build.gradle
+++ b/aws-android-sdk-cognitoidentityprovider-test/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
diff --git a/aws-android-sdk-cognitoidentityprovider/build.gradle b/aws-android-sdk-cognitoidentityprovider/build.gradle
index fc3d215090..327b4d5bd9 100644
--- a/aws-android-sdk-cognitoidentityprovider/build.gradle
+++ b/aws-android-sdk-cognitoidentityprovider/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 
     testOptions.unitTests.includeAndroidResources = true
diff --git a/aws-android-sdk-comprehend/build.gradle b/aws-android-sdk-comprehend/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-comprehend/build.gradle
+++ b/aws-android-sdk-comprehend/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-connect/build.gradle b/aws-android-sdk-connect/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-connect/build.gradle
+++ b/aws-android-sdk-connect/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-connectparticipant/build.gradle b/aws-android-sdk-connectparticipant/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-connectparticipant/build.gradle
+++ b/aws-android-sdk-connectparticipant/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-core-test/build.gradle b/aws-android-sdk-core-test/build.gradle
index 5d41047e9a..6455990356 100644
--- a/aws-android-sdk-core-test/build.gradle
+++ b/aws-android-sdk-core-test/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 }
@@ -35,4 +33,3 @@ devicefarm {
 
     devicePool 'AWSAndroidKeyStoreTesterPool'
 }
-
diff --git a/aws-android-sdk-core/build.gradle b/aws-android-sdk-core/build.gradle
index ada3a87c7a..d19f214472 100644
--- a/aws-android-sdk-core/build.gradle
+++ b/aws-android-sdk-core/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
 
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }
diff --git a/aws-android-sdk-ddb-document/build.gradle b/aws-android-sdk-ddb-document/build.gradle
index ba571e1961..7fc819f1b7 100644
--- a/aws-android-sdk-ddb-document/build.gradle
+++ b/aws-android-sdk-ddb-document/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-ddb-mapper/build.gradle b/aws-android-sdk-ddb-mapper/build.gradle
index 437c4afd1e..9a483471d3 100644
--- a/aws-android-sdk-ddb-mapper/build.gradle
+++ b/aws-android-sdk-ddb-mapper/build.gradle
@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-ddb/build.gradle b/aws-android-sdk-ddb/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-ddb/build.gradle
+++ b/aws-android-sdk-ddb/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-ec2/build.gradle b/aws-android-sdk-ec2/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-ec2/build.gradle
+++ b/aws-android-sdk-ec2/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-iot-test/build.gradle b/aws-android-sdk-iot-test/build.gradle
index 6cf62d15b6..4817f3b03d 100644
--- a/aws-android-sdk-iot-test/build.gradle
+++ b/aws-android-sdk-iot-test/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         testInstrumentationRunnerArguments(['notClass': 'org.conscrypt.KitKatPlatformOpenSSLSocketImplAdapter'])
     }
diff --git a/aws-android-sdk-iot/build.gradle b/aws-android-sdk-iot/build.gradle
index e18423ac4c..47d7f460a7 100644
--- a/aws-android-sdk-iot/build.gradle
+++ b/aws-android-sdk-iot/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-kinesis/build.gradle b/aws-android-sdk-kinesis/build.gradle
index 3458bf00d5..1722767390 100644
--- a/aws-android-sdk-kinesis/build.gradle
+++ b/aws-android-sdk-kinesis/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle b/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle
index ef70c3f86d..4b9212432a 100644
--- a/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle
+++ b/aws-android-sdk-kinesisvideo-archivedmedia/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 21 // for kinesisvideo, which uses camera2 APIs.
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 
     packagingOptions {
diff --git a/aws-android-sdk-kinesisvideo-signaling/build.gradle b/aws-android-sdk-kinesisvideo-signaling/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-kinesisvideo-signaling/build.gradle
+++ b/aws-android-sdk-kinesisvideo-signaling/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-kinesisvideo/build.gradle b/aws-android-sdk-kinesisvideo/build.gradle
index 654cf6d0ee..8880a99737 100644
--- a/aws-android-sdk-kinesisvideo/build.gradle
+++ b/aws-android-sdk-kinesisvideo/build.gradle
@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 24 // https://developer.android.com/reference/javax/net/ssl/X509ExtendedTrustManager
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 
     packagingOptions {
diff --git a/aws-android-sdk-kms/build.gradle b/aws-android-sdk-kms/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-kms/build.gradle
+++ b/aws-android-sdk-kms/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-lambda/build.gradle b/aws-android-sdk-lambda/build.gradle
index 40343d197f..3278fcebd7 100644
--- a/aws-android-sdk-lambda/build.gradle
+++ b/aws-android-sdk-lambda/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-lex/build.gradle b/aws-android-sdk-lex/build.gradle
index fa49b5a78b..dd04f88063 100644
--- a/aws-android-sdk-lex/build.gradle
+++ b/aws-android-sdk-lex/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-logs/build.gradle b/aws-android-sdk-logs/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-logs/build.gradle
+++ b/aws-android-sdk-logs/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-machinelearning/build.gradle b/aws-android-sdk-machinelearning/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-machinelearning/build.gradle
+++ b/aws-android-sdk-machinelearning/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-mobile-client/build.gradle b/aws-android-sdk-mobile-client/build.gradle
index 7217cee0fd..94c68530db 100644
--- a/aws-android-sdk-mobile-client/build.gradle
+++ b/aws-android-sdk-mobile-client/build.gradle
@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // FB, Google, UI, UserPools all need 14, Hosted UI needs 16
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
diff --git a/aws-android-sdk-mobileanalytics/build.gradle b/aws-android-sdk-mobileanalytics/build.gradle
index 84069bf713..db06e4e333 100644
--- a/aws-android-sdk-mobileanalytics/build.gradle
+++ b/aws-android-sdk-mobileanalytics/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-pinpoint-test/build.gradle b/aws-android-sdk-pinpoint-test/build.gradle
index 71246852ab..24552da5e9 100644
--- a/aws-android-sdk-pinpoint-test/build.gradle
+++ b/aws-android-sdk-pinpoint-test/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 18 // UIAutomator
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 }
diff --git a/aws-android-sdk-pinpoint/build.gradle b/aws-android-sdk-pinpoint/build.gradle
index 6006011690..9d79addc26 100644
--- a/aws-android-sdk-pinpoint/build.gradle
+++ b/aws-android-sdk-pinpoint/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // androidx core, for NotificationCompat
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-polly/build.gradle b/aws-android-sdk-polly/build.gradle
index 40343d197f..3278fcebd7 100644
--- a/aws-android-sdk-polly/build.gradle
+++ b/aws-android-sdk-polly/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-rekognition/build.gradle b/aws-android-sdk-rekognition/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-rekognition/build.gradle
+++ b/aws-android-sdk-rekognition/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-s3-test/build.gradle b/aws-android-sdk-s3-test/build.gradle
index 8bc9c38bb7..0095aca38a 100644
--- a/aws-android-sdk-s3-test/build.gradle
+++ b/aws-android-sdk-s3-test/build.gradle
@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // ext junit
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
diff --git a/aws-android-sdk-s3/build.gradle b/aws-android-sdk-s3/build.gradle
index 6b9baf9089..e3fd38fdbe 100644
--- a/aws-android-sdk-s3/build.gradle
+++ b/aws-android-sdk-s3/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-sagemaker-runtime/build.gradle b/aws-android-sdk-sagemaker-runtime/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-sagemaker-runtime/build.gradle
+++ b/aws-android-sdk-sagemaker-runtime/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-sdb/build.gradle b/aws-android-sdk-sdb/build.gradle
index 0be2e3fc15..ff98d43a57 100644
--- a/aws-android-sdk-sdb/build.gradle
+++ b/aws-android-sdk-sdb/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-ses/build.gradle b/aws-android-sdk-ses/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-ses/build.gradle
+++ b/aws-android-sdk-ses/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-sns/build.gradle b/aws-android-sdk-sns/build.gradle
index 7704cd45d9..a51729242d 100644
--- a/aws-android-sdk-sns/build.gradle
+++ b/aws-android-sdk-sns/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-sqs/build.gradle b/aws-android-sdk-sqs/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-sqs/build.gradle
+++ b/aws-android-sdk-sqs/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-testutils/build.gradle b/aws-android-sdk-testutils/build.gradle
index af2141358b..423529c6cd 100644
--- a/aws-android-sdk-testutils/build.gradle
+++ b/aws-android-sdk-testutils/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // junit ext
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-textract/build.gradle b/aws-android-sdk-textract/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-textract/build.gradle
+++ b/aws-android-sdk-textract/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-transcribe/build.gradle b/aws-android-sdk-transcribe/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-transcribe/build.gradle
+++ b/aws-android-sdk-transcribe/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/aws-android-sdk-translate/build.gradle b/aws-android-sdk-translate/build.gradle
index aaf287b661..968734419f 100644
--- a/aws-android-sdk-translate/build.gradle
+++ b/aws-android-sdk-translate/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 29
-        versionCode 21800
-        versionName '2.18.0'
     }
 }
 
diff --git a/build.gradle b/build.gradle
index 1f593687a3..3e79f2ee0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,3 +20,18 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+subprojects { project ->
+    afterEvaluate {
+        configureAndroidLibrary(project)
+    }
+}
+
+private void configureAndroidLibrary(Project project) {
+    project.android {
+        defaultConfig {
+            versionCode rootProject.findProperty('VERSION_CODE').toInteger()
+            versionName rootProject.findProperty('VERSION_NAME')
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index b1cd26e67e..228bf0200c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,7 +25,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 GROUP=com.amazonaws
-VERSION_NAME=2.18.0
+VERSION_NAME=@SDK_VERSION@
+VERSION_CODE=1
 
 POM_URL=https://github.com/aws/aws-sdk-android
 POM_SCM_URL=https://github.com/aws/aws-sdk-android