Skip to content

Commit dc0ff89

Browse files
authored
Update dependencies for 4.3.0 (#1537)
1 parent 44736a6 commit dc0ff89

File tree

5 files changed

+15
-41
lines changed

5 files changed

+15
-41
lines changed

auth/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies {
3535
api(Config.Libs.PlayServices.auth)
3636

3737
compileOnly(Config.Libs.Provider.facebook)
38+
implementation(Config.Libs.Support.v4) // Needed to override deps
3839
implementation(Config.Libs.Support.cardView) // Needed to override Facebook
3940
compileOnly(Config.Libs.Provider.twitter) { isTransitive = true }
4041

auth/src/main/java/com/firebase/ui/auth/util/ui/BaselineTextInputLayout.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

auth/src/main/res/layout/fui_phone_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
app:layout_constraintStart_toStartOf="parent"
2626
app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />
2727

28-
<com.firebase.ui.auth.util.ui.BaselineTextInputLayout
28+
<android.support.design.widget.TextInputLayout
2929
android:id="@+id/phone_layout"
3030
style="@style/FirebaseUI.TextInputLayout.PhoneField"
3131
android:layout_width="0dp"
@@ -39,7 +39,7 @@
3939
style="@style/FirebaseUI.TextInputEditText.PhoneField"
4040
android:imeOptions="actionDone" />
4141

42-
</com.firebase.ui.auth.util.ui.BaselineTextInputLayout>
42+
</android.support.design.widget.TextInputLayout>
4343

4444
<Button
4545
android:id="@+id/send_code"

auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void testGetCountryCode() {
8585
}
8686

8787
@Test
88-
@Config(constants = BuildConfig.class, sdk = 16)
88+
@Config(sdk = 16)
8989
public void testFormatNumberToE164_belowApi21() {
9090
String validPhoneNumber = "+919994947354";
9191
CountryInfo indiaCountryInfo = new CountryInfo(new Locale("", "IN"), 91);

buildSrc/src/main/kotlin/Config.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ object Config {
55
private const val kotlinVersion = "1.2.61"
66

77
object SdkVersions {
8-
const val compile = 27
9-
const val target = 27
8+
const val compile = 28
9+
const val target = 28
1010
const val min = 16
1111
}
1212

1313
object Plugins {
1414
const val android = "com.android.tools.build:gradle:3.2.1"
1515
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
16-
const val google = "com.google.gms:google-services:4.0.2"
16+
const val google = "com.google.gms:google-services:4.2.0"
1717

1818
const val bintray = "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
1919
const val buildInfo = "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
@@ -25,7 +25,7 @@ object Config {
2525
}
2626

2727
object Support {
28-
private const val version = "27.1.1"
28+
private const val version = "28.0.0"
2929

3030
const val multidex = "com.android.support:multidex:1.0.3"
3131
const val annotations = "com.android.support:support-annotations:$version"
@@ -35,6 +35,7 @@ object Config {
3535
const val recyclerView = "com.android.support:recyclerview-v7:$version"
3636
const val cardView = "com.android.support:cardview-v7:$version"
3737
const val customTabs = "com.android.support:customtabs:$version"
38+
const val mediaCompat = "com.android.support:support-media-compat:$version"
3839

3940
const val constraint = "com.android.support.constraint:constraint-layout:1.1.3"
4041
}
@@ -51,11 +52,11 @@ object Config {
5152
}
5253

5354
object Firebase {
54-
const val core = "com.google.firebase:firebase-core:16.0.4"
55+
const val core = "com.google.firebase:firebase-core:16.0.5"
5556
const val auth = "com.google.firebase:firebase-auth:16.0.5"
56-
const val firestore = "com.google.firebase:firebase-firestore:17.1.1"
57-
const val database = "com.google.firebase:firebase-database:16.0.3"
58-
const val storage = "com.google.firebase:firebase-storage:16.0.3"
57+
const val firestore = "com.google.firebase:firebase-firestore:17.1.3"
58+
const val database = "com.google.firebase:firebase-database:16.0.5"
59+
const val storage = "com.google.firebase:firebase-storage:16.0.5"
5960
}
6061

6162
object PlayServices {
@@ -64,7 +65,7 @@ object Config {
6465

6566

6667
object Provider {
67-
const val facebook = "com.facebook.android:facebook-login:4.35.0"
68+
const val facebook = "com.facebook.android:facebook-login:4.38.1"
6869
// WARNING: the Twitter requires Java 8 support. Therefore, the dep cannot be upgraded
6970
// futher until we decide to force clients to enable Java 8 support.
7071
const val twitter = "com.twitter.sdk.android:twitter-core:3.1.1@aar"
@@ -99,7 +100,7 @@ object Config {
99100
const val junit = "junit:junit:4.12"
100101
const val truth = "com.google.truth:truth:0.42"
101102
const val mockito = "org.mockito:mockito-android:2.21.0"
102-
const val robolectric = "org.robolectric:robolectric:3.8"
103+
const val robolectric = "org.robolectric:robolectric:4.0.2"
103104

104105
const val runner = "com.android.support.test:runner:1.0.2"
105106
const val rules = "com.android.support.test:rules:1.0.2"

0 commit comments

Comments
 (0)