diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-07 07:02:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-07 07:02:03 +0000 |
| commit | 3fa34ba02e598b799515557f100f7faf2db53f1d (patch) | |
| tree | 61f65ab7f43f07d6c13b56ff13dc35428cbd1e39 | |
| parent | ff069bf426ce086a1bf867ab6738256d4349b0ff (diff) | |
| parent | b5791829aa0d76b35e423909d511e14b14c1fef9 (diff) | |
| download | support-3fa34ba02e598b799515557f100f7faf2db53f1d.tar.gz | |
Merge "appcompat is 1.4.0-rc01" into androidx-main
| -rw-r--r-- | appcompat/appcompat/build.gradle | 8 | ||||
| -rw-r--r-- | buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle index 84e135d300d..7636b193291 100644 --- a/appcompat/appcompat/build.gradle +++ b/appcompat/appcompat/build.gradle @@ -13,8 +13,8 @@ dependencies { api(project(":annotation:annotation")) api(project(":core:core")) - implementation("androidx.emoji2:emoji2:1.0.0-beta01") - implementation("androidx.emoji2:emoji2-views-helper:1.0.0-beta01") + implementation(project(":emoji2:emoji2")) + implementation(project(":emoji2:emoji2-views-helper")) implementation("androidx.collection:collection:1.0.0") api("androidx.cursoradapter:cursoradapter:1.0.0") api("androidx.activity:activity:1.2.4") @@ -23,10 +23,10 @@ dependencies { api("androidx.drawerlayout:drawerlayout:1.0.0") implementation("androidx.lifecycle:lifecycle-runtime:2.3.1") implementation("androidx.lifecycle:lifecycle-viewmodel:2.3.1") - implementation("androidx.resourceinspection:resourceinspection-annotation:1.0.0-beta01") + implementation(project(":resourceinspection:resourceinspection-annotation")) api("androidx.savedstate:savedstate:1.1.0") - kapt("androidx.resourceinspection:resourceinspection-processor:1.0.0-beta01") + kapt(project(":resourceinspection:resourceinspection-processor")) androidTestImplementation(libs.kotlinStdlib) androidTestImplementation(libs.testExtJunit) diff --git a/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt index 9331e4a9e57..0503209ea2e 100644 --- a/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt +++ b/buildSrc/public/src/main/kotlin/androidx/build/LibraryVersions.kt @@ -24,7 +24,7 @@ object LibraryVersions { val ADS_IDENTIFIER = Version("1.0.0-alpha05") val ANNOTATION = Version("1.3.0-rc01") val ANNOTATION_EXPERIMENTAL = Version("1.2.0-alpha01") - val APPCOMPAT = Version("1.4.0-beta02") + val APPCOMPAT = Version("1.4.0-rc01") val APPSEARCH = Version("1.0.0-alpha03") val ARCH_CORE = Version("2.2.0-alpha01") val ASYNCLAYOUTINFLATER = Version("1.1.0-alpha01") |