Skip to content

Update dependencies for 4.3.0 #1537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions auth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies {
api(Config.Libs.PlayServices.auth)

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

Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions auth/src/main/res/layout/fui_phone_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBaseline_toBaselineOf="@+id/phone_layout" />

<com.firebase.ui.auth.util.ui.BaselineTextInputLayout
<android.support.design.widget.TextInputLayout
android:id="@+id/phone_layout"
style="@style/FirebaseUI.TextInputLayout.PhoneField"
android:layout_width="0dp"
Expand All @@ -39,7 +39,7 @@
style="@style/FirebaseUI.TextInputEditText.PhoneField"
android:imeOptions="actionDone" />

</com.firebase.ui.auth.util.ui.BaselineTextInputLayout>
</android.support.design.widget.TextInputLayout>

<Button
android:id="@+id/send_code"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void testGetCountryCode() {
}

@Test
@Config(constants = BuildConfig.class, sdk = 16)
@Config(sdk = 16)
public void testFormatNumberToE164_belowApi21() {
String validPhoneNumber = "+919994947354";
CountryInfo indiaCountryInfo = new CountryInfo(new Locale("", "IN"), 91);
Expand Down
21 changes: 11 additions & 10 deletions buildSrc/src/main/kotlin/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ object Config {
private const val kotlinVersion = "1.2.61"

object SdkVersions {
const val compile = 27
const val target = 27
const val compile = 28
const val target = 28
const val min = 16
}

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

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

object Support {
private const val version = "27.1.1"
private const val version = "28.0.0"

const val multidex = "com.android.support:multidex:1.0.3"
const val annotations = "com.android.support:support-annotations:$version"
Expand All @@ -35,6 +35,7 @@ object Config {
const val recyclerView = "com.android.support:recyclerview-v7:$version"
const val cardView = "com.android.support:cardview-v7:$version"
const val customTabs = "com.android.support:customtabs:$version"
const val mediaCompat = "com.android.support:support-media-compat:$version"

const val constraint = "com.android.support.constraint:constraint-layout:1.1.3"
}
Expand All @@ -51,11 +52,11 @@ object Config {
}

object Firebase {
const val core = "com.google.firebase:firebase-core:16.0.4"
const val core = "com.google.firebase:firebase-core:16.0.5"
const val auth = "com.google.firebase:firebase-auth:16.0.5"
const val firestore = "com.google.firebase:firebase-firestore:17.1.1"
const val database = "com.google.firebase:firebase-database:16.0.3"
const val storage = "com.google.firebase:firebase-storage:16.0.3"
const val firestore = "com.google.firebase:firebase-firestore:17.1.3"
const val database = "com.google.firebase:firebase-database:16.0.5"
const val storage = "com.google.firebase:firebase-storage:16.0.5"
}

object PlayServices {
Expand All @@ -64,7 +65,7 @@ object Config {


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

const val runner = "com.android.support.test:runner:1.0.2"
const val rules = "com.android.support.test:rules:1.0.2"
Expand Down