Move versionName and versionCode from module build files to project build file

richardmcclellan · richardmcclellan · commit b49be10bd8f6 · 2020-09-11T20:47:45.000-05:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/aws-android-sdk-sqs/build.gradle b/aws-android-sdk-sqs/build.gradle
diff --git a/aws-android-sdk-testutils/build.gradle b/aws-android-sdk-testutils/build.gradle
diff --git a/aws-android-sdk-textract/build.gradle b/aws-android-sdk-textract/build.gradle
diff --git a/aws-android-sdk-transcribe/build.gradle b/aws-android-sdk-transcribe/build.gradle
diff --git a/aws-android-sdk-translate/build.gradle b/aws-android-sdk-translate/build.gradle
diff --git a/build.gradle b/build.gradle
diff --git a/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ android {`
`7`	`7`	`defaultConfig {`
`8`	`8`	`minSdkVersion 9`
`9`	`9`	`targetSdkVersion 29`
`10`		`- versionCode 21800`
`11`		`- versionName '2.18.0'`
`12`	`10`	`}`
`13`	`11`	`}`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ android {`
`6`	`6`	`defaultConfig {`
`7`	`7`	`minSdkVersion 14 // junit ext`
`8`	`8`	`targetSdkVersion 29`
`9`		`- versionCode 21800`
`10`		`- versionName '2.18.0'`
`11`	`9`	`testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'`
`12`	`10`	`}`
`13`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ android {`
`7`	`7`	`defaultConfig {`
`8`	`8`	`minSdkVersion 11`
`9`	`9`	`targetSdkVersion 29`
`10`		`- versionCode 21800`
`11`		`- versionName '2.18.0'`
`12`	`10`	`}`
`13`	`11`	`}`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ android {`
`7`	`7`	`defaultConfig {`
`8`	`8`	`minSdkVersion 14 // v4 support, brought from facebook sdk`
`9`	`9`	`targetSdkVersion 29`
`10`		`- versionCode 21800`
`11`		`- versionName '2.18.0'`
`12`	`10`	`}`
`13`	`11`	`}`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ android {`
`7`	`7`	`defaultConfig {`
`8`	`8`	`minSdkVersion 14 // gms auth brought by google sdk`
`9`	`9`	`targetSdkVersion 29`
`10`		`- versionCode 21800`
`11`		`- versionName '2.18.0'`
`12`	`10`	`}`
`13`	`11`	`}`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ android {`
`7`	`7`	`defaultConfig {`
`8`	`8`	`minSdkVersion 14 // appcompat`
`9`	`9`	`targetSdkVersion 29`
`10`		`- versionCode 21800`
`11`		`- versionName '2.18.0'`
`12`	`10`	`}`
`13`	`11`	`}`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ android {`
`7`	`7`	`defaultConfig {`
`8`	`8`	`minSdkVersion 14 // setAllCaps(), 11 otherwise`
`9`	`9`	`targetSdkVersion 29`
`10`		`- versionCode 21800`
`11`		`- versionName '2.18.0'`
`12`	`10`	`}`
`13`	`11`	`}`
`14`	`12`