Fold autodispose-android-ktx into autodispose-android

uber · Apr 6, 2019 · 8a82327 · 8a82327
1 parent c89a71d
commit 8a82327
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -186,9 +186,6 @@ 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.
 
-For each artifact, there is a corresponding kotlin extensions artifact with it. Example:
-`autodispose-android` -> `autodispose-android-ktx`.
-
 Note that the project is compiled against Java 8. If you need support for lower Java versions, you should
 use D8 (Android Gradle Plugin 3.2+) or desugar as needed (depending on the build system).
 
@@ -323,11 +320,6 @@ implementation 'com.uber.autodispose:autodispose-rxlifecycle3:x.y.z'
 
 Kotlin extensions:
 
-`autodispose-android-ktx` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-android-ktx.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-android-ktx) 
-```gradle
-implementation 'com.uber.autodispose:autodispose-android-ktx:x.y.z'
-```
-
 `autodispose-android-archcomponents-ktx` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-android-archcomponents-ktx.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-android-archcomponents-ktx) 
 ```gradle
 implementation 'com.uber.autodispose:autodispose-android-archcomponents-ktx:x.y.z'

diff --git a/android/autodispose-android-ktx/Module.md b/android/autodispose-android-ktx/Module.md
diff --git a/android/autodispose-android-ktx/build.gradle b/android/autodispose-android-ktx/build.gradle
diff --git a/android/autodispose-android-ktx/gradle.properties b/android/autodispose-android-ktx/gradle.properties
diff --git a/android/autodispose-android-ktx/src/main/AndroidManifest.xml b/android/autodispose-android-ktx/src/main/AndroidManifest.xml
diff --git a/android/autodispose-android/autodispose-android.pro b/android/autodispose-android/autodispose-android.pro
@@ -0,0 +1 @@
+-dontwarn com.uber.autodispose.android.AutoDisposeAndroid
diff --git a/android/autodispose-android/build.gradle b/android/autodispose-android/build.gradle
@@ -19,6 +19,7 @@ dependencies {
   api deps.rx.java
   api deps.androidx.annotations
   implementation deps.rx.android
+  implementation deps.kotlin.stdlib
 
   lintChecks project(':static-analysis:autodispose-lint')
 

diff --git a/...autodispose/android/AutoDisposeAndroid.kt → ...autodispose/android/AutoDisposeAndroid.kt b/...autodispose/android/AutoDisposeAndroid.kt → ...autodispose/android/AutoDisposeAndroid.kt
@@ -15,6 +15,7 @@
  */
 
 @file:Suppress("NOTHING_TO_INLINE")
+@file:JvmName("AutoDisposeAndroid")
 
 package com.uber.autodispose.android
 

diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,8 @@ buildscript {
 }
 
 Set<String> mixedSourcesArtifacts = [
-    "autodispose"
+    "autodispose",
+    "android:autodispose-android"
 ]
 subprojects {
   repositories {

diff --git a/settings.gradle b/settings.gradle
@@ -55,7 +55,6 @@ pluginManagement {
 rootProject.name = 'autodispose-root'
 if (System.getenv("ANDROID_HOME") != null) {
   include ':android:autodispose-android'
-  include ':android:autodispose-android-ktx'
   include ':android:autodispose-android-archcomponents'
   include ':android:autodispose-android-archcomponents-ktx'
   include ':android:autodispose-android-archcomponents-test'