-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Join the cool kids club (aka migrate to Gradle Kotlin DSL) #1321
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
samtstern
merged 12 commits into
firebase:version-4.0.1-dev
from
SUPERCILEX:gradle-kotlin-dsl
May 30, 2018
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
d0cba2f
Join the cool kids club (aka migrate to Gradle Kotlin DSL)
SUPERCILEX 316acc6
Merge remote-tracking branch 'upstream/master' into gradle-kotlin-dsl
SUPERCILEX 91678cd
Fix merge mistakes
SUPERCILEX f2f6188
Finalize refactor
SUPERCILEX eb02072
Last few tidies
SUPERCILEX 1114a43
Fix merge mistakes
SUPERCILEX 91e8b64
Fix broken tests
SUPERCILEX 06a530e
Ignore debug variant of proguard tests
SUPERCILEX 62d1ddb
Fix minor lint issues
SUPERCILEX 27002fb
Address review feedback
SUPERCILEX 3d0abc1
Fix merge mistakes
SUPERCILEX 8abf58b
Merge remote-tracking branch 'upstream/version-4.0.1-dev' into gradle…
SUPERCILEX File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// NOTE: this project uses Gradle Kotlin DSL. More common build.gradle instructions can be found in | ||
// the main README. | ||
|
||
android { | ||
defaultConfig { | ||
multiDexEnabled = true | ||
} | ||
|
||
buildTypes { | ||
getByName("release") { | ||
// For the purposes of the sample, allow testing of a proguarded release build | ||
// using the debug key | ||
signingConfig = signingConfigs["debug"] | ||
|
||
postprocessing { | ||
isRemoveUnusedCode = true | ||
isRemoveUnusedResources = true | ||
isObfuscate = true | ||
isOptimizeCode = true | ||
} | ||
} | ||
} | ||
|
||
lintOptions { | ||
disable("ResourceName", "MissingTranslation") | ||
} | ||
} | ||
|
||
dependencies { | ||
implementation(Config.Libs.Firebase.core) | ||
implementation(Config.Libs.Support.design) | ||
implementation(Config.Libs.Support.multidex) | ||
|
||
implementation(project(":auth")) | ||
implementation(project(":firestore")) | ||
implementation(project(":database")) | ||
implementation(project(":storage")) | ||
|
||
implementation(Config.Libs.Provider.facebook) | ||
// Needed to override Facebook | ||
implementation(Config.Libs.Support.cardView) | ||
implementation(Config.Libs.Support.customTabs) | ||
implementation(Config.Libs.Provider.twitter) { isTransitive = true } | ||
|
||
implementation(Config.Libs.Misc.glide) | ||
annotationProcessor(Config.Libs.Misc.glideCompiler) | ||
|
||
// Used for FirestorePagingActivity | ||
implementation(Config.Libs.Arch.paging) | ||
|
||
// The following dependencies are not required to use the Firebase UI library. | ||
// They are used to make some aspects of the demo app implementation simpler for | ||
// demonstrative purposes, and you may find them useful in your own apps; YMMV. | ||
implementation(Config.Libs.Misc.permissions) | ||
implementation(Config.Libs.Misc.butterKnife) | ||
annotationProcessor(Config.Libs.Misc.butterKnifeCompiler) | ||
debugImplementation(Config.Libs.Misc.leakCanary) | ||
releaseImplementation(Config.Libs.Misc.leakCanaryNoop) | ||
testImplementation(Config.Libs.Misc.leakCanaryNoop) | ||
} | ||
|
||
apply(plugin = "com.google.gms.google-services") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
import com.android.build.gradle.internal.dsl.TestOptions | ||
|
||
android { | ||
buildTypes { | ||
getByName("release") { | ||
postprocessing { | ||
consumerProguardFiles("auth-proguard.pro") | ||
} | ||
} | ||
} | ||
|
||
lintOptions { | ||
disable("UnusedQuantity") | ||
} | ||
|
||
testOptions { | ||
unitTests(closureOf<TestOptions.UnitTestOptions> { | ||
isIncludeAndroidResources = true | ||
}) | ||
} | ||
} | ||
|
||
dependencies { | ||
implementation(Config.Libs.Support.design) | ||
implementation(Config.Libs.Support.customTabs) | ||
implementation(Config.Libs.Support.constraint) | ||
implementation(Config.Libs.Misc.materialProgress) | ||
|
||
implementation(Config.Libs.Arch.extensions) | ||
annotationProcessor(Config.Libs.Arch.compiler) | ||
|
||
api(Config.Libs.Firebase.auth) | ||
api(Config.Libs.PlayServices.auth) | ||
|
||
compileOnly(Config.Libs.Provider.facebook) | ||
// Needed to override Facebook | ||
implementation(Config.Libs.Support.cardView) | ||
implementation(Config.Libs.Support.customTabs) | ||
compileOnly(Config.Libs.Provider.twitter) { isTransitive = true } | ||
|
||
testImplementation(Config.Libs.Test.junit) | ||
testImplementation(Config.Libs.Test.mockito) | ||
testImplementation(Config.Libs.Test.robolectric) | ||
testImplementation(Config.Libs.Provider.facebook) | ||
testImplementation(Config.Libs.Provider.twitter) { isTransitive = true } | ||
|
||
debugImplementation(project(":internal:lintchecks")) | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add a big comment on this file saying something like "hey we R cool kidz so we use the Kotlin DSL. If you're writing an app that uses FirebaseUI check out README.md for better examples" or something like that (please not that verbatim)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haha, I'm definitely going to quote you on that one! 😁 Side note: do you think we should rename
:app
to:sample
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've gone ahead with that change though it's in one commit we can easily kill if you disagree.