Unify android sdk version configuration. (#220)

vkryachko · web-flow · commit 016b19ce8342 · 2019-01-30T10:13:32.000-05:00
diff --git a/fiamui-app/fiamui-app.gradle b/fiamui-app/fiamui-app.gradle
@@ -15,12 +15,12 @@
 apply plugin: "com.android.application"
 
 android {
-  compileSdkVersion 27
+  compileSdkVersion project.targetSdkVersion
 
   defaultConfig {
     applicationId "com.example.firebase.fiamui"
     minSdkVersion 16
-    targetSdkVersion 27
+    targetSdkVersion project.targetSdkVersion
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle
@@ -14,17 +14,15 @@
 
 apply plugin: 'com.android.library'
 
-def androidVersion = 28
-
 android {
     adbOptions {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion androidVersion
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
-      minSdkVersion 14
-      targetSdkVersion androidVersion
+      minSdkVersion project.minSdkVersion
+      targetSdkVersion project.targetSdkVersion
       versionName version
       multiDexEnabled true
       testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/firebase-database-collection/firebase-database-collection.gradle b/firebase-database-collection/firebase-database-collection.gradle
@@ -14,10 +14,8 @@
 
 apply plugin: 'com.android.library'
 
-def androidVersion = 28
-
 android {
-    compileSdkVersion androidVersion
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
         minSdkVersion 9
     }
diff --git a/firebase-database/firebase-database.gradle b/firebase-database/firebase-database.gradle
@@ -14,9 +14,6 @@
 
 apply plugin: 'com.android.library'
 
-def androidVersion = 28
-
-
 tasks.withType(org.gradle.api.tasks.testing.Test) {
     testLogging {
         exceptionFormat = 'full'
@@ -32,10 +29,10 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion androidVersion
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
-        targetSdkVersion androidVersion
-        minSdkVersion 14
+        targetSdkVersion project.targetSdkVersion
+        minSdkVersion project.minSdkVersion
         versionName version
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
@@ -15,8 +15,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.google.protobuf'
 
-def androidVersion = 28
-
 protobuf {
     // Configure the protoc executable
     protoc {
@@ -53,10 +51,10 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion androidVersion
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
-        targetSdkVersion androidVersion
-        minSdkVersion 14
+        targetSdkVersion project.targetSdkVersion
+        minSdkVersion project.minSdkVersion
         versionName version
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/firebase-functions/firebase-functions.gradle b/firebase-functions/firebase-functions.gradle
@@ -14,17 +14,15 @@
 
 apply plugin: 'com.android.library'
 
-def androidVersion = 28
-
 android {
     adbOptions {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion androidVersion
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
-        targetSdkVersion androidVersion
-        minSdkVersion 14
+        targetSdkVersion project.targetSdkVersion
+        minSdkVersion project.minSdkVersion
         versionName version
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -15,11 +15,10 @@
 apply plugin: "com.android.library"
 
 android {
-    compileSdkVersion 28
-
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
@@ -14,8 +14,6 @@
 
 apply plugin: 'com.android.library'
 
-def androidVersion = 28
-
 
 tasks.withType(org.gradle.api.tasks.testing.Test) {
     testLogging {
@@ -32,10 +30,10 @@ android {
         timeOutInMs 60 * 1000
     }
 
-    compileSdkVersion androidVersion
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
-        targetSdkVersion androidVersion
-        minSdkVersion 14
+        targetSdkVersion project.targetSdkVersion
+        minSdkVersion project.minSdkVersion
         multiDexEnabled true
         versionName version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/protolite-well-known-types/protolite-well-known-types.gradle b/protolite-well-known-types/protolite-well-known-types.gradle
@@ -40,11 +40,10 @@ protobuf {
     }
 }
 android {
-    compileSdkVersion 28
-
+    compileSdkVersion project.targetSdkVersion
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion project.targetSdkVersion
+        minSdkVersion project.minSdkVersion
         versionCode 1
         versionName '1.0'
     }
diff --git a/root-project.gradle b/root-project.gradle
@@ -37,6 +37,8 @@ buildscript {
     }
 }
 
+apply from: 'sdkProperties.gradle'
+
 ext {
     playServicesVersion = '16.0.1'
     supportAnnotationsVersion = '28.0.0'
diff --git a/sdkProperties.gradle b/sdkProperties.gradle
@@ -0,0 +1,18 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+ext {
+    targetSdkVersion = 28
+    minSdkVersion = 14
+}
diff --git a/test-apps/build.gradle b/test-apps/build.gradle
@@ -31,6 +31,8 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
+apply from: '../sdkProperties.gradle'
+
 allprojects {
     ext.testBuildType = project.getProperties().get("testBuildType", "debug")
 
diff --git a/test-apps/database-test-app/build.gradle b/test-apps/database-test-app/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 
 android {
     testBuildType = project.testBuildType
-    compileSdkVersion 28
+    compileSdkVersion project.targetSdkVersion
 
     defaultConfig {
         applicationId "com.google.firebase.testapps.database"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
diff --git a/test-apps/firestore-test-app/build.gradle b/test-apps/firestore-test-app/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 
 android {
     testBuildType = project.testBuildType
-    compileSdkVersion 28
+    compileSdkVersion project.targetSdkVersion
 
     defaultConfig {
         applicationId "com.google.firebase.testapps.firestore"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
diff --git a/test-apps/functions-test-app/build.gradle b/test-apps/functions-test-app/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 
 android {
     testBuildType = project.testBuildType
-    compileSdkVersion 28
+    compileSdkVersion project.targetSdkVersion
 
     defaultConfig {
         applicationId "com.google.firebase.testapps.functions"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
diff --git a/test-apps/storage-test-app/build.gradle b/test-apps/storage-test-app/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 
 android {
     testBuildType = project.testBuildType
-    compileSdkVersion 28
+    compileSdkVersion project.targetSdkVersion
 
     defaultConfig {
         applicationId "com.google.firebase.testapps.storage"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
diff --git a/tools/apksize/default.gradle b/tools/apksize/default.gradle
@@ -25,13 +25,13 @@ android {
         abortOnError false
         checkReleaseBuilds false
     }
-    compileSdkVersion 26
+    compileSdkVersion project.targetSdkVersion
 
     defaultConfig {
         applicationId 'com.google.apksize'
-        minSdkVersion 26
-	multiDexEnabled true
-        targetSdkVersion 26
+        minSdkVersion project.targetSdkVersion
+	    multiDexEnabled true
+        targetSdkVersion project.targetSdkVersion
         versionCode 1
         versionName '1.0'
     }

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,10 @@ protobuf {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`android {`
`43`		`- compileSdkVersion 28`
`44`		`-`
	`43`	`+ compileSdkVersion project.targetSdkVersion`
`45`	`44`	`defaultConfig {`
`46`		`- minSdkVersion 14`
`47`		`- targetSdkVersion 28`
	`45`	`+ targetSdkVersion project.targetSdkVersion`
	`46`	`+ minSdkVersion project.minSdkVersion`
`48`	`47`	`versionCode 1`
`49`	`48`	`versionName '1.0'`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ buildscript {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+apply from: 'sdkProperties.gradle'`
	`41`	`+`
`40`	`42`	`ext {`
`41`	`43`	`playServicesVersion = '16.0.1'`
`42`	`44`	`supportAnnotationsVersion = '28.0.0'`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ plugins {`
`31`	`31`	`id 'com.github.ben-manes.versions' version '0.20.0'`
`32`	`32`	`}`
`33`	`33`
	`34`	`+apply from: '../sdkProperties.gradle'`
	`35`	`+`
`34`	`36`	`allprojects {`
`35`	`37`	`ext.testBuildType = project.getProperties().get("testBuildType", "debug")`
`36`	`38`