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

Fold autodispose-android-ktx into autodispose-android #341

Merged
merged 6 commits into from
May 12, 2019

Conversation

ShaishavGandhi
Copy link
Collaborator

Ref #340

README.md Show resolved Hide resolved
@ShaishavGandhi
Copy link
Collaborator Author

Still trying to figure out why the androidJavadoc is being run instead of dokka 😪

@ShaishavGandhi
Copy link
Collaborator Author

@ZacSweers Can you take a look again? It's been a while so might be good to get a fresh eye again.

@@ -95,7 +95,7 @@ subprojects {
boolean isLint = project.path.endsWith("-lint")
boolean isKotlin = project.path.endsWith("-ktx") || isLint || isMixedSourceSet
boolean isSample = project.name == "sample"
boolean isJavaLibrary = !isAndroidLibrary && !isKotlin && !isSample || isMixedSourceSet
boolean isJavaLibrary = !isAndroidLibrary && !isKotlin && !isSample || (isMixedSourceSet && !isAndroidLibrary)
Copy link
Collaborator

Choose a reason for hiding this comment

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

(isMixedSourceSet && !isAndroidLibrary)

Isn't !isAndroidLibrary redundant?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The OR branch is always evaluated and if it's an Android library, we wouldn't want to apply the 'java-library` plugin (it gives an error).

README.md Outdated
@@ -186,6 +186,8 @@ There are three artifacts with extra support for Android:
* `autodispose-android-archcomponents` has a `AndroidLifecycleScopeProvider` for use with `LifecycleOwner` and `Lifecycle` implementations.
* `autodispose-android-archcomponents-test` has a `TestLifecycleOwner` for use in testing.

Kotlin extension artifacts are a [WIP for the next release](https://github.com/uber/AutoDispose/issues/340).
Copy link
Collaborator

Choose a reason for hiding this comment

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

Generally shouldn't mark WIP stuff in the README, let's remove this for now. README should just reflect current master

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Makes sense d12ba8c

@ZacSweers
Copy link
Collaborator

@shaishavgandhi05 do you know what continuous-integration/travis-ci is? It should only be running the PR build. I can't see any information about it either, and it appears to be hung up. We'll have to force land these as admin due to it never reporting back.

@briankhsieh maybe is this something new from the org side relating to the travis-ci.com migration?

@ZacSweers ZacSweers merged commit eaab750 into master May 12, 2019
@ZacSweers ZacSweers deleted the sg/autodispose-android-ktx branch May 12, 2019 07:38
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