diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-20 19:15:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-20 19:15:46 +0000 |
| commit | 11333ab734d7ec7a7048a4a27f120eba379c3eb8 (patch) | |
| tree | c87d9557a7a4f3657d1f501d339c76207d540ab6 | |
| parent | 34049a271876b7da34abf7ce581093fa1024fe5a (diff) | |
| parent | 1b6eccdba1ccd6896a90059434a1796e02f04bc8 (diff) | |
| download | support-snap-temp-L50800000731030978.tar.gz | |
Merge "Merge cherrypicks of [1468323, 1468343] into androidx-startup-release" into androidx-startup-releasesnap-temp-L50800000731030978
| -rw-r--r-- | buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt | 2 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt | 2 | ||||
| -rw-r--r-- | startup/startup-runtime/build.gradle | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt index cb22c5ee8cc..eb2590b6f9f 100644 --- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt +++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt @@ -103,7 +103,7 @@ object LibraryVersions { val SLICE_BUILDERS_KTX = Version("1.0.0-alpha08") val SLICE_REMOTECALLBACK = Version("1.0.0-alpha01") val SLIDINGPANELAYOUT = Version("1.2.0-alpha01") - val STARTUP = Version("1.0.0-rc01") + val STARTUP = Version("1.0.0") val SQLITE = Version("2.1.0-rc01") val SQLITE_INSPECTOR = Version("2.1.0-alpha01") val SWIPEREFRESHLAYOUT = Version("1.2.0-alpha01") diff --git a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt index c30d0f429b1..24b1473e841 100644 --- a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt +++ b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt @@ -145,7 +145,7 @@ val RELEASE_RULE = docsRules("public", false) { prebuilts(LibraryGroups.STARTUP, "1.0.0-beta01") prebuilts(LibraryGroups.SWIPEREFRESHLAYOUT, "1.2.0-alpha01") prebuilts(LibraryGroups.TEXTCLASSIFIER, "1.0.0-alpha03") - prebuilts(LibraryGroups.TRACING, "1.0.0-beta01") + prebuilts(LibraryGroups.TRACING, "1.0.0") ignore(LibraryGroups.TRANSITION.group, "transition-ktx") prebuilts(LibraryGroups.TRANSITION, "1.4.0-beta01") prebuilts(LibraryGroups.TVPROVIDER, "1.1.0-alpha01") diff --git a/startup/startup-runtime/build.gradle b/startup/startup-runtime/build.gradle index db30b53efc5..65cf91f30d3 100644 --- a/startup/startup-runtime/build.gradle +++ b/startup/startup-runtime/build.gradle @@ -39,7 +39,7 @@ android { dependencies { implementation("androidx.annotation:annotation:1.1.0") - implementation('androidx.tracing:tracing:1.0.0-rc01') + implementation('androidx.tracing:tracing:1.0.0') lintPublish(project(':startup:startup-runtime-lint')) androidTestImplementation(KOTLIN_STDLIB) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) |