-
Notifications
You must be signed in to change notification settings - Fork 226
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
Conversation
android/autodispose-android/src/main/java/com/uber/autodispose/android/AutoDisposeAndroid.kt
Outdated
Show resolved
Hide resolved
8a82327
to
da380b7
Compare
Still trying to figure out why the |
@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) |
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.
(isMixedSourceSet && !isAndroidLibrary)
Isn't !isAndroidLibrary
redundant?
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.
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). |
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.
Generally shouldn't mark WIP stuff in the README, let's remove this for now. README should just reflect current master
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.
Makes sense d12ba8c
@shaishavgandhi05 do you know what @briankhsieh maybe is this something new from the org side relating to the travis-ci.com migration? |
Ref #340