Rename -kotlin artifacts to -ktx (#229)

Part of #214
uber · Jul 27, 2018 · 393cf83 · 393cf83
1 parent 8b6e751
commit 393cf83
Show file tree

Hide file tree

Showing 23 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -194,11 +194,11 @@ There are three artifacts with extra support for Android:
 * `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-kotlin`.
+`autodispose-android` -> `autodispose-android-ktx`.
 
 ##### Kotlin
 
-Kotlin extension artifacts are available for almost every artifact by adding `-kotlin` to the ID like 
+Kotlin extension artifacts are available for almost every artifact by adding `-ktx` to the ID like 
 above.
 
 ##### RxLifecycle
@@ -317,24 +317,24 @@ compile 'com.uber.autodispose:autodispose-rxlifecycle:x.y.z'
 
 Kotlin extensions:
 
-`autodispose-kotlin` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-kotlin.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-kotlin) 
+`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
-compile 'com.uber.autodispose:autodispose-kotlin:x.y.z'
+compile 'com.uber.autodispose:autodispose-ktx:x.y.z'
 ```
 
-`autodispose-android-kotlin` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-android-kotlin.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-android-kotlin) 
+`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
-compile 'com.uber.autodispose:autodispose-android-kotlin:x.y.z'
+compile 'com.uber.autodispose:autodispose-android-ktx:x.y.z'
 ```
 
-`autodispose-android-archcomponents-kotlin` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-android-archcomponents-kotlin.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-android-archcomponents-kotlin) 
+`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
-compile 'com.uber.autodispose:autodispose-android-archcomponents-kotlin:x.y.z'
+compile 'com.uber.autodispose:autodispose-android-archcomponents-ktx:x.y.z'
 ```
 
-`autodispose-android-archcomponents-test-kotlin` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-android-archcomponents-test-kotlin.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-android-archcomponents-test-kotlin) 
+`autodispose-android-archcomponents-test-ktx` [![Maven Central](https://img.shields.io/maven-central/v/com.uber.autodispose/autodispose-android-archcomponents-test-ktx.svg)](https://mvnrepository.com/artifact/com.uber.autodispose/autodispose-android-archcomponents-test-ktx) 
 ```gradle
-compile 'com.uber.autodispose:autodispose-android-archcomponents-test-kotlin:x.y.z'
+compile 'com.uber.autodispose:autodispose-android-archcomponents-test-ktx:x.y.z'
 ```
 
 Javadocs and KDocs for the most recent release can be found here: https://uber.github.io/AutoDispose/0.x/

diff --git a/...ndroid-archcomponents-kotlin/build.gradle → ...e-android-archcomponents-ktx/build.gradle b/...ndroid-archcomponents-kotlin/build.gradle → ...e-android-archcomponents-ktx/build.gradle
diff --git a/...onents-kotlin/consumer-proguard-rules.txt → ...omponents-ktx/consumer-proguard-rules.txt b/...onents-kotlin/consumer-proguard-rules.txt → ...omponents-ktx/consumer-proguard-rules.txt
diff --git a/...d-archcomponents-kotlin/gradle.properties → ...roid-archcomponents-ktx/gradle.properties b/...d-archcomponents-kotlin/gradle.properties → ...roid-archcomponents-ktx/gradle.properties
@@ -15,5 +15,5 @@
 #
 
 POM_NAME=AutoDispose (Android Architecture Components Kotlin Extensions)
-POM_ARTIFACT_ID=autodispose-android-archcomponents-kotlin
+POM_ARTIFACT_ID=autodispose-android-archcomponents-ktx
 POM_PACKAGING=aar
diff --git a/...nents-kotlin/src/main/AndroidManifest.xml → ...mponents-ktx/src/main/AndroidManifest.xml b/...nents-kotlin/src/main/AndroidManifest.xml → ...mponents-ktx/src/main/AndroidManifest.xml
diff --git a/.../lifecycle/autodisposeAndroidLifecycle.kt → .../lifecycle/autodisposeAndroidLifecycle.kt b/.../lifecycle/autodisposeAndroidLifecycle.kt → .../lifecycle/autodisposeAndroidLifecycle.kt
diff --git a/...d-archcomponents-test-kotlin/build.gradle → ...roid-archcomponents-test-ktx/build.gradle b/...d-archcomponents-test-kotlin/build.gradle → ...roid-archcomponents-test-ktx/build.gradle
diff --git a/...s-test-kotlin/consumer-proguard-rules.txt → ...ents-test-ktx/consumer-proguard-rules.txt b/...s-test-kotlin/consumer-proguard-rules.txt → ...ents-test-ktx/consumer-proguard-rules.txt
diff --git a/...hcomponents-test-kotlin/gradle.properties → ...archcomponents-test-ktx/gradle.properties b/...hcomponents-test-kotlin/gradle.properties → ...archcomponents-test-ktx/gradle.properties
@@ -15,5 +15,5 @@
 #
 
 POM_NAME=AutoDispose (Android Architecture Components Test Kotlin Extensions)
-POM_ARTIFACT_ID=autodispose-android-archcomponents-test-kotlin
+POM_ARTIFACT_ID=autodispose-android-archcomponents-test-ktx
 POM_PACKAGING=aar
diff --git a/...-test-kotlin/src/main/AndroidManifest.xml → ...nts-test-ktx/src/main/AndroidManifest.xml b/...-test-kotlin/src/main/AndroidManifest.xml → ...nts-test-ktx/src/main/AndroidManifest.xml
diff --git a/...e/test/autodisposeAndroidLifecycleTest.kt → ...e/test/autodisposeAndroidLifecycleTest.kt b/...e/test/autodisposeAndroidLifecycleTest.kt → ...e/test/autodisposeAndroidLifecycleTest.kt
diff --git a/...d/autodispose-android-kotlin/build.gradle → android/autodispose-android-ktx/build.gradle b/...d/autodispose-android-kotlin/build.gradle → android/autodispose-android-ktx/build.gradle
diff --git a/...ndroid-kotlin/consumer-proguard-rules.txt → ...e-android-ktx/consumer-proguard-rules.txt b/...ndroid-kotlin/consumer-proguard-rules.txt → ...e-android-ktx/consumer-proguard-rules.txt
diff --git a/...odispose-android-kotlin/gradle.properties → ...autodispose-android-ktx/gradle.properties b/...odispose-android-kotlin/gradle.properties → ...autodispose-android-ktx/gradle.properties
@@ -15,5 +15,5 @@
 #
 
 POM_NAME=AutoDispose (Android Kotlin Extensions)
-POM_ARTIFACT_ID=autodispose-android-kotlin
+POM_ARTIFACT_ID=autodispose-android-ktx
 POM_PACKAGING=aar
diff --git a/...droid-kotlin/src/main/AndroidManifest.xml → ...-android-ktx/src/main/AndroidManifest.xml b/...droid-kotlin/src/main/AndroidManifest.xml → ...-android-ktx/src/main/AndroidManifest.xml
diff --git a/...autodispose/android/autodisposeAndroid.kt → ...autodispose/android/autodisposeAndroid.kt b/...autodispose/android/autodisposeAndroid.kt → ...autodispose/android/autodisposeAndroid.kt
diff --git a/autodispose-kotlin/build.gradle → autodispose-ktx/build.gradle b/autodispose-kotlin/build.gradle → autodispose-ktx/build.gradle
diff --git a/autodispose-kotlin/gradle.properties → autodispose-ktx/gradle.properties b/autodispose-kotlin/gradle.properties → autodispose-ktx/gradle.properties
@@ -1,3 +1,3 @@
 POM_NAME=AutoDispose (Kotlin Extensions)
-POM_ARTIFACT_ID=autodispose-kotlin
+POM_ARTIFACT_ID=autodispose-ktx
 POM_PACKAGING=jar
diff --git a/...om/uber/autodispose/kotlin/autodispose.kt → ...om/uber/autodispose/kotlin/autodispose.kt b/...om/uber/autodispose/kotlin/autodispose.kt → ...om/uber/autodispose/kotlin/autodispose.kt
diff --git a/...todispose/kotlin/AutoDisposeKotlinTest.kt → ...todispose/kotlin/AutoDisposeKotlinTest.kt b/...todispose/kotlin/AutoDisposeKotlinTest.kt → ...todispose/kotlin/AutoDisposeKotlinTest.kt
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -43,7 +43,7 @@ dependencies {
   implementation project(':android:autodispose-android')
   implementation project(':android:autodispose-android-archcomponents')
   implementation project(':autodispose')
-  implementation project(':autodispose-kotlin')
+  implementation project(':autodispose-ktx')
   implementation project(':lifecycle:autodispose-lifecycle')
   implementation 'com.android.support:appcompat-v7:27.0.2'
   implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'

diff --git a/sample/src/main/kotlin/com/uber/autodispose/sample/ArchComponentActivity.kt b/sample/src/main/kotlin/com/uber/autodispose/sample/ArchComponentActivity.kt
@@ -30,7 +30,7 @@ import io.reactivex.schedulers.Schedulers
 class ArchComponentActivity: AppCompatActivity() {
 
   companion object {
-    private const val TAG = "AutoDispose-Kotlin"
+    private const val TAG = "AutoDispose-ktx"
   }
 
   private val scopeProvider by lazy { AndroidLifecycleScopeProvider.from(this) }

diff --git a/settings.gradle b/settings.gradle
@@ -53,15 +53,15 @@ pluginManagement {
 rootProject.name = 'autodispose-root'
 if (System.getenv("ANDROID_HOME") != null) {
   include ':android:autodispose-android'
-  include ':android:autodispose-android-kotlin'
+  include ':android:autodispose-android-ktx'
   include ':android:autodispose-android-archcomponents'
-  include ':android:autodispose-android-archcomponents-kotlin'
+  include ':android:autodispose-android-archcomponents-ktx'
   include ':android:autodispose-android-archcomponents-test'
-  include ':android:autodispose-android-archcomponents-test-kotlin'
+  include ':android:autodispose-android-archcomponents-test-ktx'
   include ':sample'
 }
 include ':autodispose'
-include ':autodispose-kotlin'
+include ':autodispose-ktx'
 include ':lifecycle:autodispose-lifecycle'
 include ':lifecycle:autodispose-lifecycle-jdk8'
 include ':lifecycle:autodispose-lifecycle-ktx'