Skip to content

Commit 98bbb52

Browse files
committed
Setup two build variants for preview release
Also, upgrade gradle + bump version to 5.0.0 BUG: 73451839 Change-Id: I2509be0867d1b0a4e74bad24a4b2cdfa2438e45c
1 parent 3eed62f commit 98bbb52

File tree

2 files changed

+25
-15
lines changed

2 files changed

+25
-15
lines changed

app/build.gradle

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply from: '../dist.gradle'
55
ext {
66
/* Version code for *next* release, bump *after* a release is created. */
77
// 1 or more digits
8-
versionMajor = 4
8+
versionMajor = 5
99
// exactly 1 digit
1010
versionMinor = 0
1111
// exactly 2 digits
12-
versionBuild = 06
12+
versionBuild = 00
1313
}
1414

1515
android {
@@ -32,11 +32,21 @@ android {
3232
}
3333
}
3434

35+
flavorDimensions "targetSdk", "packageName"
3536
productFlavors {
36-
main {
37-
37+
targetP {
38+
dimension 'targetSdk'
39+
targetSdkVersion 28
40+
}
41+
targetO {
42+
dimension 'targetSdk'
43+
targetSdkVersion 27
44+
}
45+
normal {
46+
dimension 'packageName'
3847
}
3948
replica {
49+
dimension 'packageName'
4050
applicationIdSuffix ".replica"
4151
}
4252
}
@@ -76,14 +86,14 @@ android {
7686
}
7787

7888
dependencies {
79-
compile 'com.android.support:multidex:1.0.1'
80-
compile 'com.android.support:preference-v14:27.0.2'
81-
compile 'com.android.support:recyclerview-v7:27.0.2'
82-
compile 'com.android.support:support-v13:27.0.2'
83-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
84-
compile 'com.google.android.gms:play-services-safetynet:+'
85-
compile(name: 'setup-wizard-lib-platform-release', ext: 'aar')
86-
compile 'org.bouncycastle:bcpkix-jdk15on:1.56'
87-
compile 'org.bouncycastle:bcprov-jdk15on:1.56'
88-
compile 'com.google.guava:guava:23.6-android'
89+
implementation 'com.android.support:multidex:1.0.1'
90+
implementation 'com.android.support:preference-v14:27.0.2'
91+
implementation 'com.android.support:recyclerview-v7:27.0.2'
92+
implementation 'com.android.support:support-v13:27.0.2'
93+
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
94+
implementation 'com.google.android.gms:play-services-safetynet:+'
95+
implementation(name: 'setup-wizard-lib-platform-release', ext: 'aar')
96+
implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
97+
implementation 'org.bouncycastle:bcprov-jdk15on:1.56'
98+
implementation 'com.google.guava:guava:23.6-android'
8999
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip

0 commit comments

Comments
 (0)