Skip to content

Commit f7cbc1e

Browse files
SUPERCILEXsamtstern
SUPERCILEX
authored and
samtstern
committed
Migrate to Gradle Kotlin DSL (firebase#1321)
Join the cool kids club
1 parent e3401e1 commit f7cbc1e

43 files changed

Lines changed: 727 additions & 1010 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AUTHORS‎

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

‎CONTRIBUTORS‎

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

‎app/build.gradle‎

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

‎app/build.gradle.kts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// NOTE: this project uses Gradle Kotlin DSL. More common build.gradle instructions can be found in
2+
// the main README.
3+
4+
android {
5+
defaultConfig {
6+
multiDexEnabled = true
7+
}
8+
9+
buildTypes {
10+
getByName("release") {
11+
// For the purposes of the sample, allow testing of a proguarded release build
12+
// using the debug key
13+
signingConfig = signingConfigs["debug"]
14+
15+
postprocessing {
16+
isRemoveUnusedCode = true
17+
isRemoveUnusedResources = true
18+
isObfuscate = true
19+
isOptimizeCode = true
20+
}
21+
}
22+
}
23+
24+
lintOptions {
25+
disable("ResourceName", "MissingTranslation")
26+
}
27+
}
28+
29+
dependencies {
30+
implementation(Config.Libs.Firebase.core)
31+
implementation(Config.Libs.Support.design)
32+
implementation(Config.Libs.Support.multidex)
33+
34+
implementation(project(":auth"))
35+
implementation(project(":firestore"))
36+
implementation(project(":database"))
37+
implementation(project(":storage"))
38+
39+
implementation(Config.Libs.Provider.facebook)
40+
// Needed to override Facebook
41+
implementation(Config.Libs.Support.cardView)
42+
implementation(Config.Libs.Support.customTabs)
43+
implementation(Config.Libs.Provider.twitter) { isTransitive = true }
44+
45+
implementation(Config.Libs.Misc.glide)
46+
annotationProcessor(Config.Libs.Misc.glideCompiler)
47+
48+
// Used for FirestorePagingActivity
49+
implementation(Config.Libs.Arch.paging)
50+
51+
// The following dependencies are not required to use the Firebase UI library.
52+
// They are used to make some aspects of the demo app implementation simpler for
53+
// demonstrative purposes, and you may find them useful in your own apps; YMMV.
54+
implementation(Config.Libs.Misc.permissions)
55+
implementation(Config.Libs.Misc.butterKnife)
56+
annotationProcessor(Config.Libs.Misc.butterKnifeCompiler)
57+
debugImplementation(Config.Libs.Misc.leakCanary)
58+
releaseImplementation(Config.Libs.Misc.leakCanaryNoop)
59+
testImplementation(Config.Libs.Misc.leakCanaryNoop)
60+
}
61+
62+
apply(plugin = "com.google.gms.google-services")

‎app/src/main/res/layout/activity_chat.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
android:layout_weight="1"
4545
android:hint="@string/hint_message"
4646
android:imeOptions="actionDone"
47-
android:inputType="text" />
47+
android:importantForAutofill="no"
48+
android:inputType="text"
49+
tools:ignore="UnusedAttribute" />
4850

4951
<Button
5052
android:id="@+id/sendButton"

‎auth/build.gradle‎

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

‎auth/build.gradle.kts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import com.android.build.gradle.internal.dsl.TestOptions
2+
3+
android {
4+
buildTypes {
5+
getByName("release") {
6+
postprocessing {
7+
consumerProguardFiles("auth-proguard.pro")
8+
}
9+
}
10+
}
11+
12+
lintOptions {
13+
disable("UnusedQuantity")
14+
}
15+
16+
testOptions {
17+
unitTests(closureOf<TestOptions.UnitTestOptions> {
18+
isIncludeAndroidResources = true
19+
})
20+
}
21+
}
22+
23+
dependencies {
24+
implementation(Config.Libs.Support.design)
25+
implementation(Config.Libs.Support.customTabs)
26+
implementation(Config.Libs.Support.constraint)
27+
implementation(Config.Libs.Misc.materialProgress)
28+
29+
implementation(Config.Libs.Arch.extensions)
30+
annotationProcessor(Config.Libs.Arch.compiler)
31+
32+
api(Config.Libs.Firebase.auth)
33+
api(Config.Libs.PlayServices.auth)
34+
35+
compileOnly(Config.Libs.Provider.facebook)
36+
// Needed to override Facebook
37+
implementation(Config.Libs.Support.cardView)
38+
implementation(Config.Libs.Support.customTabs)
39+
compileOnly(Config.Libs.Provider.twitter) { isTransitive = true }
40+
41+
testImplementation(Config.Libs.Test.junit)
42+
testImplementation(Config.Libs.Test.mockito)
43+
testImplementation(Config.Libs.Test.robolectric)
44+
testImplementation(Config.Libs.Provider.facebook)
45+
testImplementation(Config.Libs.Provider.twitter) { isTransitive = true }
46+
47+
debugImplementation(project(":internal:lintchecks"))
48+
}

‎auth/src/main/res/layout-land/fui_auth_method_picker_layout.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
android:textColor="?android:attr/textColorTertiary"
5454
android:textIsSelectable="true"
5555
app:layout_constraintLeft_toLeftOf="parent"
56-
app:layout_constraintRight_toLeftOf="@id/container"
56+
app:layout_constraintRight_toLeftOf="@+id/container"
5757
app:layout_constraintBottom_toBottomOf="parent" />
58+
5859
</android.support.constraint.ConstraintLayout>

‎auth/src/main/res/layout/fui_auth_method_picker_layout.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
app:layout_constraintStart_toStartOf="parent"
3434
app:layout_constraintEnd_toEndOf="parent"
3535
app:layout_constraintTop_toTopOf="parent"
36-
app:layout_constraintBottom_toTopOf="@id/main_tos_and_pp"
36+
app:layout_constraintBottom_toTopOf="@+id/main_tos_and_pp"
3737
app:layout_constraintVertical_bias="0.7">
3838

3939
<LinearLayout

‎auth/src/main/res/layout/fui_welcome_back_password_prompt_layout.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<ScrollView
3+
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:app="http://schemas.android.com/apk/res-auto"
45
xmlns:tools="http://schemas.android.com/tools"
56
android:layout_width="match_parent"
@@ -58,22 +59,22 @@
5859
android:layout_height="wrap_content"
5960
android:layout_marginTop="@dimen/fui_field_padding_vert"
6061
android:text="@string/fui_trouble_signing_in"
61-
app:layout_constraintEnd_toStartOf="@+id/button_done"
6262
app:layout_constraintStart_toStartOf="parent"
63+
app:layout_constraintEnd_toStartOf="@+id/button_done"
6364
app:layout_constraintTop_toBottomOf="@+id/password_layout" />
6465

6566
<Button
6667
android:id="@+id/button_done"
6768
style="@style/FirebaseUI.Button"
6869
android:text="@string/fui_sign_in_default"
69-
app:layout_constraintEnd_toEndOf="parent"
7070
app:layout_constraintStart_toEndOf="@+id/trouble_signing_in"
71+
app:layout_constraintEnd_toEndOf="parent"
7172
app:layout_constraintTop_toTopOf="@+id/trouble_signing_in" />
7273

7374
<TextView
7475
android:id="@+id/email_footer_tos_and_pp_text"
7576
style="@style/FirebaseUI.PrivacyFooter"
76-
app:layout_constraintTop_toBottomOf="@id/button_done" />
77+
app:layout_constraintTop_toBottomOf="@+id/button_done" />
7778

7879
</android.support.constraint.ConstraintLayout>
7980

0 commit comments

Comments
 (0)