Move Kotlin extension functions to main artifact

.gitignore

@@ -48,9 +48,6 @@ build/
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
-
 # Lint
 lint-report.html
 lint-report_files/

README.md

@@ -323,11 +323,6 @@ implementation 'com.uber.autodispose:autodispose-rxlifecycle3:x.y.z'
 
 Kotlin extensions:
 
-`autodispose-ktx` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-ktx.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-ktx) 
-```gradle
-implementation 'com.uber.autodispose:autodispose-ktx:x.y.z'
-```
-
 `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/build.gradle

@@ -26,6 +26,7 @@ lintOptions {
 
 dependencies {
   api deps.rx.java
+  implementation deps.kotlin.stdlib
 
   signature deps.build.animalSniffer
   lintChecks project(':static-analysis:autodispose-lint')

autodispose-ktx/src/main/kotlin/com/uber/autodispose/AutoDispose.kt → autodispose/src/main/java/com/uber/autodispose/KotlinExtensions.kt

@@ -15,6 +15,7 @@
  */
 
 @file:Suppress("NOTHING_TO_INLINE")
+@file:JvmName("KotlinExtensions")
 
 package com.uber.autodispose
 

autodispose/src/main/resources/META-INF/proguard/autodispose.pro

@@ -0,0 +1,2 @@
+# Top-level functions that can only be used by Kotlin.
+-dontwarn com.uber.autodispose.KotlinExtensions

build.gradle

@@ -35,19 +35,23 @@ buildscript {
   }
 }
 
+Set<String> mixedSourcesArtifacts = [
+    "autodispose"
+]
 subprojects {
   repositories {
     google()
     mavenCentral()
     jcenter()
   }
 
+  boolean isMixedSourceSet = project.name in mixedSourcesArtifacts
   boolean isAndroidLibrary = project.path.startsWith(":android:")
   boolean isLint = project.path.endsWith("-lint")
-  boolean isKotlin = project.path.endsWith("-ktx") || isLint
+  boolean isKotlin = project.path.endsWith("-ktx") || isLint || isMixedSourceSet
   boolean isSample = project.name == "sample"
-  boolean isJavaLibrary = !isAndroidLibrary && !isKotlin && !isSample
-  boolean usesErrorProne = !isKotlin && !isSample
+  boolean isJavaLibrary = !isAndroidLibrary && !isKotlin && !isSample || isMixedSourceSet
+  boolean usesErrorProne = !isKotlin && !isSample || isMixedSourceSet
   if (isAndroidLibrary) {
     project.apply plugin: 'com.android.library'
     project.android {
@@ -81,7 +85,8 @@ subprojects {
       project.apply plugin: 'org.jetbrains.kotlin.jvm'
       project.apply plugin: 'org.jetbrains.dokka'
     }
-    if (!isLint) {
+    // Lint must be compileOnly, mixed source sets (for now) must manually specify depending on needs
+    if (!(isLint || isMixedSourceSet)) {
       project.dependencies {
         api deps.kotlin.stdlib
       }

sample/build.gradle

@@ -81,7 +81,6 @@ dependencies {
   implementation project(':android:autodispose-android')
   implementation project(':android:autodispose-android-archcomponents')
   implementation project(':autodispose')
-  implementation project(':autodispose-ktx')
   implementation project(':lifecycle:autodispose-lifecycle')
   implementation 'androidx.appcompat:appcompat:1.0.2'
   implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'

settings.gradle

@@ -63,7 +63,6 @@ if (System.getenv("ANDROID_HOME") != null) {
   include ':sample'
 }
 include ':autodispose'
-include ':autodispose-ktx'
 include ':lifecycle:autodispose-lifecycle'
 include ':lifecycle:autodispose-lifecycle-jdk8'
 include ':lifecycle:autodispose-lifecycle-ktx'