Snap for 4653835 from 0cdf8f1bc7ed50a8abf90a88d381e2069fe3d05e to ub-testdpc-pic-release

Change-Id: I90fe4c849094d91025f94a71b89b6acd8e0f8af6

Author: android-build-team Robot

app/build.gradle

@@ -5,11 +5,11 @@ apply from: '../dist.gradle'
 ext {
     /* Version code for *next* release, bump *after* a release is created. */
     // 1 or more digits
-    versionMajor = 4
+    versionMajor = 5
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 06
+    versionBuild = 00
 }
 
 android {
@@ -32,11 +32,21 @@ android {
         }
     }
 
+    flavorDimensions "targetSdk", "packageName"
     productFlavors {
-        main {
-
+        targetP {
+            dimension 'targetSdk'
+            targetSdkVersion 28
+        }
+        targetO {
+            dimension 'targetSdk'
+            targetSdkVersion 27
+        }
+        normal {
+            dimension 'packageName'
         }
         replica {
+            dimension 'packageName'
             applicationIdSuffix ".replica"
         }
     }
@@ -76,14 +86,14 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'com.android.support:preference-v14:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
-    compile 'com.android.support:support-v13:27.0.2'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.google.android.gms:play-services-safetynet:+'
-    compile(name: 'setup-wizard-lib-platform-release', ext: 'aar')
-    compile 'org.bouncycastle:bcpkix-jdk15on:1.56'
-    compile 'org.bouncycastle:bcprov-jdk15on:1.56'
-    compile 'com.google.guava:guava:23.6-android'
+    implementation 'com.android.support:multidex:1.0.1'
+    implementation 'com.android.support:preference-v14:27.0.2'
+    implementation 'com.android.support:recyclerview-v7:27.0.2'
+    implementation 'com.android.support:support-v13:27.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.google.android.gms:play-services-safetynet:+'
+    implementation(name: 'setup-wizard-lib-platform-release', ext: 'aar')
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.56'
+    implementation 'com.google.guava:guava:23.6-android'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip