Skip to content
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

Add empty resource rule if using resource union. #438

Merged
merged 1 commit into from
May 4, 2017

Conversation

runningcode
Copy link
Contributor

This ensures that an R file is created for that module even if there are
no resources. Gradle always generates an R file for each module even if
there are no resources.

Copy link
Contributor

@kageiit kageiit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just one minor nit

apply plugin: 'com.android.library'
apply plugin: 'me.tatarka.retrolambda'

android {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you dont need the empty android block

@@ -0,0 +1,10 @@
apply plugin: 'com.android.library'
apply plugin: 'me.tatarka.retrolambda'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove retrolambda?

This ensures that an R file is created for that module even if there are
no resources. Gradle always generates an R file for each module even if
there are no resources.
@runningcode
Copy link
Contributor Author

Removed retrolambda and removed empty android block.

@kageiit kageiit merged commit 406e95e into uber:master May 4, 2017
@runningcode runningcode deleted the no/resource-rule branch May 4, 2017 18:40
cwoodwar6 pushed a commit to cwoodwar6/okbuck that referenced this pull request May 10, 2017
* uber/master:
  Use stream instead of parallelStream (uber#437)
  Add empty resource rule if using resource union. (uber#438)
  Publich v0.20.7
  Move okbuck task to its own gradle task class. (uber#436)
  Use try-with-resources (uber#432)
  Update README.md
  Do not allow okbuck to be run without okbuck.wrapper set to true. (uber#433)
  Set descriptions in tasks class instead of when creating them. (uber#431)
  Move cleaning the .okbuck/gen folder to the first step of setupOkbuck. (uber#430)
  Publish v0.20.6
  Add support for downloading 22-25 API robolectric runtime dependencies. (uber#427)
  Skip okbuck if we just want to kill the buck daemon. (uber#425)
kageiit pushed a commit that referenced this pull request May 30, 2017
cwoodwar6 pushed a commit to cwoodwar6/okbuck that referenced this pull request Jun 27, 2017
* uber/master:
  Setup Kotlin home whenever the kotlin gradle plugin is on the classpath. (uber#464)
  Update several dependencies to latest (uber#462)
  Remove kotlin-dev repo as 1.1.3 is now released
  Add support for mixed kotlin and java in regular kotlin modules. (uber#461)
  Publish v0.22.1
  Fix rule type propagation
  Publish v0.22.0
  Update kotlin, gradle and buck versions (uber#460)
  Add kotlin android integration test and fixup source detection (uber#459)
  Kotlin Android Support (uber#458)
  Use more abstractions (uber#457)
  Prefer abstractions over implementations for upcoming kotlin refactors (uber#456)
  Add option to exclude some resources from aapt (uber#455)
  Bump to gradle 4.0 stable. (uber#454)
  Publish v0.21.0
  Migrate to kotlin in memory compiler support in buck (uber#450)
  Change how dependencies are resolved in preparation for Andrioid Gradle Plugin 3.x (uber#451)
  Switch the ordering of build config fields. (uber#449)
  Publish v0.20.10
  Revert "Add empty resource rule if using resource union. (uber#438)"
cwoodwar6 pushed a commit to cwoodwar6/okbuck that referenced this pull request Jul 27, 2017
* upstream/master:
  Publish v0.21.0
  Migrate to kotlin in memory compiler support in buck (uber#450)
  Change how dependencies are resolved in preparation for Andrioid Gradle Plugin 3.x (uber#451)
  Switch the ordering of build config fields. (uber#449)
  Publish v0.20.10
  Revert "Add empty resource rule if using resource union. (uber#438)"
cwoodwar6 pushed a commit to cwoodwar6/okbuck that referenced this pull request Jul 27, 2017
…o master

* commit '59bc6fbe8b69da8ca16adbc600928eeafab69ed1':
  Publish v0.21.0
  Migrate to kotlin in memory compiler support in buck (uber#450)
  Change how dependencies are resolved in preparation for Andrioid Gradle Plugin 3.x (uber#451)
  Switch the ordering of build config fields. (uber#449)
  Publish v0.20.10
  Revert "Add empty resource rule if using resource union. (uber#438)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants