Skip to content

Commit c93c7b7

Browse files
authored
Merge pull request #596 from SUPERCILEX/broken-minSdkVersion
Fix broken `minSdkVersion`
2 parents 3aa9175 + 175468c commit c93c7b7

File tree

5 files changed

+33
-28
lines changed

5 files changed

+33
-28
lines changed

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ android {
2828

2929
dependencies {
3030
compile fileTree(dir: 'libs', include: ['*.jar'])
31-
compile "com.android.support:design:$support_library_version"
31+
compile "com.android.support:design:$supportLibraryVersion"
3232

3333
compile project(path: ':auth')
3434
compile project(path: ':database')
3535
compile project(path: ':storage')
3636

37-
compile "com.google.android.gms:play-services-auth:$firebase_version"
38-
compile "com.google.firebase:firebase-auth:$firebase_version"
39-
compile "com.google.firebase:firebase-database:$firebase_version"
40-
compile "com.google.firebase:firebase-storage:$firebase_version"
37+
compile "com.google.android.gms:play-services-auth:$firebaseVersion"
38+
compile "com.google.firebase:firebase-auth:$firebaseVersion"
39+
compile "com.google.firebase:firebase-database:$firebaseVersion"
40+
compile "com.google.firebase:firebase-storage:$firebaseVersion"
4141

4242
// The following dependencies are not required to use the Firebase UI library.
4343
// They are used to make some aspects of the demo app implementation simpler for

auth/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ android {
3838
}
3939

4040
dependencies {
41-
compile "com.android.support:design:$support_library_version"
42-
compile "com.android.support:customtabs:$support_library_version"
41+
compile "com.android.support:design:$supportLibraryVersion"
42+
compile "com.android.support:customtabs:$supportLibraryVersion"
4343

44-
compile "com.google.firebase:firebase-auth:$firebase_version"
45-
compile "com.google.android.gms:play-services-auth:$firebase_version"
44+
compile "com.google.firebase:firebase-auth:$firebaseVersion"
45+
compile "com.google.android.gms:play-services-auth:$firebaseVersion"
4646

4747
compile 'com.facebook.android:facebook-android-sdk:4.19.0'
4848
compile("com.twitter.sdk.android:twitter:2.3.0@aar") { transitive = true }
4949

5050
// The following libraries are needed to prevent incompatibilities with the facebook
5151
// library when updating com.android.support libraries:
52-
compile "com.android.support:cardview-v7:$support_library_version"
52+
compile "com.android.support:cardview-v7:$supportLibraryVersion"
5353

5454
testCompile 'junit:junit:4.12'
5555
//noinspection NewerVersionAvailable, GradleDynamicVersion

constants.gradle

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
project.ext.firebase_version = '10.2.0'
2-
project.ext.support_library_version = '25.1.1'
1+
project.ext {
2+
submodules = ['database', 'auth', 'storage']
3+
group = 'com.firebaseui'
4+
version = '1.1.1'
5+
pomdesc = 'Firebase UI Android'
36

4-
project.ext.submodules = ['database', 'auth', 'storage']
5-
project.ext.group = 'com.firebaseui'
6-
project.ext.version = '1.1.1'
7-
project.ext.pomdesc = 'Firebase UI Android'
8-
project.ext.buildTools = '25.0.2'
9-
project.ext.compileSdk = 25
10-
project.ext.targetSdk = 25
7+
compileSdk = 25
8+
targetSdk = 25
9+
minSdk = 14
10+
11+
buildTools = '25.0.2'
12+
13+
firebaseVersion = '10.2.0'
14+
supportLibraryVersion = '25.1.1'
15+
}

database/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
buildToolsVersion buildTools
77

88
defaultConfig {
9-
minSdkVersion 9
9+
minSdkVersion minSdk
1010
targetSdkVersion targetSdk
1111
versionCode 1
1212
versionName "1.0"
@@ -22,13 +22,13 @@ android {
2222
}
2323

2424
dependencies {
25-
compile "com.android.support:appcompat-v7:$support_library_version"
26-
compile "com.android.support:recyclerview-v7:$support_library_version"
25+
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
26+
compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
2727

28-
compile "com.google.firebase:firebase-database:$firebase_version"
28+
compile "com.google.firebase:firebase-database:$firebaseVersion"
2929

3030
androidTestCompile 'junit:junit:4.12'
31-
androidTestCompile "com.android.support:support-annotations:$support_library_version"
31+
androidTestCompile "com.android.support:support-annotations:$supportLibraryVersion"
3232
androidTestCompile 'com.android.support.test:runner:0.5'
3333
androidTestCompile 'com.android.support.test:rules:0.5'
3434
}

storage/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
buildToolsVersion buildTools
77

88
defaultConfig {
9-
minSdkVersion 11
9+
minSdkVersion minSdk
1010
targetSdkVersion targetSdk
1111
versionCode 1
1212
versionName "1.0"
@@ -21,10 +21,10 @@ android {
2121
}
2222

2323
dependencies {
24-
compile "com.android.support:appcompat-v7:${support_library_version}"
25-
compile "com.android.support:palette-v7:${support_library_version}"
24+
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
25+
compile "com.android.support:palette-v7:$supportLibraryVersion"
2626

2727
compile 'com.github.bumptech.glide:glide:3.7.0'
2828

29-
compile "com.google.firebase:firebase-storage:${firebase_version}"
29+
compile "com.google.firebase:firebase-storage:$firebaseVersion"
3030
}

0 commit comments

Comments
 (0)