Merge "Use a separate version tag for concurrent-futures-ktx" into androidx-master-dev

diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
index 8ecd926c..e47d2129 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt

@@ -37,7 +37,7 @@
     val CAR_APP = LibraryGroup("androidx.car.app")
     val CARDVIEW = LibraryGroup("androidx.cardview")
     val COLLECTION = LibraryGroup("androidx.collection")
-    val CONCURRENT = LibraryGroup("androidx.concurrent")
+    val CONCURRENT = LibraryGroup("androidx.concurrent", false)
     val CONTENTACCESS = LibraryGroup("androidx.contentaccess")
     val CONTENTPAGER = LibraryGroup("androidx.contentpager")
     val COORDINATORLAYOUT = LibraryGroup("androidx.coordinatorlayout")

diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index db61c15..15d24ff 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt

@@ -62,6 +62,7 @@
     val EXIFINTERFACE = Version("1.2.0-beta01")
     val FRAGMENT = Version("1.3.0-alpha01")
     val FUTURES = Version("1.1.0-alpha01")
+    val FUTURES_KTX = Version("1.0.0-alpha01")
     val GRIDLAYOUT = Version("1.1.0-alpha01")
     val HEIFWRITER = Version("1.1.0-alpha01")
     val INSPECTION = Version("1.0.0-alpha01")

diff --git a/concurrent/futures-ktx/api/1.1.0-alpha01.txt b/concurrent/futures-ktx/api/1.0.0-alpha01.txt
similarity index 100%
rename from concurrent/futures-ktx/api/1.1.0-alpha01.txt
rename to concurrent/futures-ktx/api/1.0.0-alpha01.txt

diff --git a/concurrent/futures-ktx/api/1.1.0-alpha01.txt b/concurrent/futures-ktx/api/public_plus_experimental_1.0.0-alpha01.txt
similarity index 100%
copy from concurrent/futures-ktx/api/1.1.0-alpha01.txt
copy to concurrent/futures-ktx/api/public_plus_experimental_1.0.0-alpha01.txt

diff --git a/concurrent/futures-ktx/api/public_plus_experimental_1.1.0-alpha01.txt b/concurrent/futures-ktx/api/public_plus_experimental_1.1.0-alpha01.txt
deleted file mode 100644
index b0c8c4b..0000000
--- a/concurrent/futures-ktx/api/public_plus_experimental_1.1.0-alpha01.txt
+++ /dev/null

@@ -1,10 +0,0 @@
-// Signature format: 3.0
-package androidx.concurrent.futures {
-
-  public final class ListenableFutureKt {
-    ctor public ListenableFutureKt();
-    method public static suspend <T> Object! await(com.google.common.util.concurrent.ListenableFuture<T>, kotlin.coroutines.Continuation<? super T> p);
-  }
-
-}
-

diff --git a/concurrent/futures-ktx/api/1.1.0-alpha01.txt b/concurrent/futures-ktx/api/restricted_1.0.0-alpha01.txt
similarity index 100%
copy from concurrent/futures-ktx/api/1.1.0-alpha01.txt
copy to concurrent/futures-ktx/api/restricted_1.0.0-alpha01.txt

diff --git a/concurrent/futures-ktx/api/restricted_1.1.0-alpha01.txt b/concurrent/futures-ktx/api/restricted_1.1.0-alpha01.txt
deleted file mode 100644
index b0c8c4b..0000000
--- a/concurrent/futures-ktx/api/restricted_1.1.0-alpha01.txt
+++ /dev/null

@@ -1,10 +0,0 @@
-// Signature format: 3.0
-package androidx.concurrent.futures {
-
-  public final class ListenableFutureKt {
-    ctor public ListenableFutureKt();
-    method public static suspend <T> Object! await(com.google.common.util.concurrent.ListenableFuture<T>, kotlin.coroutines.Continuation<? super T> p);
-  }
-
-}
-

diff --git a/concurrent/futures-ktx/build.gradle b/concurrent/futures-ktx/build.gradle
index 84f44c7..0f45ce4 100644
--- a/concurrent/futures-ktx/build.gradle
+++ b/concurrent/futures-ktx/build.gradle

@@ -42,7 +42,7 @@
 androidx {
     name = "AndroidX Futures Kotlin Extensions"
     publish = Publish.SNAPSHOT_AND_RELEASE
-    mavenVersion = LibraryVersions.FUTURES
+    mavenVersion = LibraryVersions.FUTURES_KTX
     mavenGroup = LibraryGroups.CONCURRENT
     inceptionYear = "2019"
     description = "Kotlin Extensions for Androidx implementation of Guava's ListenableFuture"