Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Google accompanist modules #556

Merged
merged 3 commits into from
Aug 31, 2022
Merged

Update Google accompanist modules #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b906fa
Update Accompanist dependency notations
rlatapy-luna Aug 31, 2022
5b930ba
Use camelCase for Google.accompanist dependency notations
LouisCAD Aug 31, 2022
1ca1c4f
Commit Revision 14 of dependency notations removals
LouisCAD Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions docs/dependencies-notations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Built-in Dependency Notations
---
# Built-in Dependency Notations

[**refreshVersions**](https://github.com/jmfayard/refreshVersions) provides **1147** Dependency Notations in **25** groups and **232** subgroups
[**refreshVersions**](https://github.com/jmfayard/refreshVersions) provides **1152** Dependency Notations in **25** groups and **233** subgroups

**Built-in Dependency Notations** are maven coordinates of popular libraries,
discoverable as for example `KotlinX.coroutines.core` in IntelliJ IDEA,
Expand Down Expand Up @@ -943,29 +943,40 @@ com.google.gms:google-services:_
version.NO-RULE" style="text-decoration: underline;" >playServicesGradlePlugin</span>&nbsp; - <span title="Google.oboe
com.google.oboe:oboe:_
version.google.oboe" style="text-decoration: underline;" >oboe</span>&nbsp;</td></tr>
<tr><td><b>Google.accompanist</b></td><td><span title="Google.accompanist.appcompatTheme
<tr><td><b>Google.accompanist</b></td><td><span title="Google.accompanist.appCompatTheme
com.google.accompanist:accompanist-appcompat-theme:_
version.google.accompanist" style="text-decoration: underline;" >appcompatTheme</span>&nbsp; - <span title="Google.accompanist.flowlayout
version.google.accompanist" style="text-decoration: underline;" >appCompatTheme</span>&nbsp; - <span title="Google.accompanist.drawablePainter
com.google.accompanist:accompanist-drawablepainter:_
version.google.accompanist" style="text-decoration: underline;" >drawablePainter</span>&nbsp; - <span title="Google.accompanist.flowLayout
com.google.accompanist:accompanist-flowlayout:_
version.google.accompanist" style="text-decoration: underline;" >flowlayout</span>&nbsp; - <span title="Google.accompanist.glide
com.google.accompanist:accompanist-glide:_
version.google.accompanist" style="text-decoration: underline;" >glide</span>&nbsp; - <span title="Google.accompanist.imageloadingCore
com.google.accompanist:accompanist-imageloading-core:_
version.google.accompanist" style="text-decoration: underline;" >imageloadingCore</span>&nbsp; - <span title="Google.accompanist.insets
version.google.accompanist" style="text-decoration: underline;" >flowLayout</span>&nbsp; - <span title="Google.accompanist.insets
com.google.accompanist:accompanist-insets:_
version.google.accompanist" style="text-decoration: underline;" >insets</span>&nbsp; - <span title="Google.accompanist.pager
version.google.accompanist" style="text-decoration: underline;" >insets</span>&nbsp; - <span title="Google.accompanist.navigationAnimation
com.google.accompanist:accompanist-navigation-animation:_
version.google.accompanist" style="text-decoration: underline;" >navigationAnimation</span>&nbsp; - <span title="Google.accompanist.navigationMaterial
com.google.accompanist:accompanist-navigation-material:_
version.google.accompanist" style="text-decoration: underline;" >navigationMaterial</span>&nbsp; - <span title="Google.accompanist.pager
com.google.accompanist:accompanist-pager:_
version.google.accompanist" style="text-decoration: underline;" >pager</span>&nbsp; - <span title="Google.accompanist.swiperefresh
version.google.accompanist" style="text-decoration: underline;" >pager</span>&nbsp; - <span title="Google.accompanist.permissions
com.google.accompanist:accompanist-permissions:_
version.google.accompanist" style="text-decoration: underline;" >permissions</span>&nbsp; - <span title="Google.accompanist.placeholder
com.google.accompanist:accompanist-placeholder:_
version.google.accompanist" style="text-decoration: underline;" >placeholder</span>&nbsp; - <span title="Google.accompanist.swipeRefresh
com.google.accompanist:accompanist-swiperefresh:_
version.google.accompanist" style="text-decoration: underline;" >swiperefresh</span>&nbsp; - <span title="Google.accompanist.systemuicontroller
version.google.accompanist" style="text-decoration: underline;" >swipeRefresh</span>&nbsp; - <span title="Google.accompanist.systemUiController
com.google.accompanist:accompanist-systemuicontroller:_
version.google.accompanist" style="text-decoration: underline;" >systemuicontroller</span>&nbsp;</td></tr>
version.google.accompanist" style="text-decoration: underline;" >systemUiController</span>&nbsp; - <span title="Google.accompanist.webView
com.google.accompanist:accompanist-webview:_
version.google.accompanist" style="text-decoration: underline;" >webView</span>&nbsp;</td></tr>
<tr><td><b>Google.accompanist.insets</b></td><td><span title="Google.accompanist.insets.ui
com.google.accompanist:accompanist-insets-ui:_
version.google.accompanist" style="text-decoration: underline;" >ui</span>&nbsp;</td></tr>
<tr><td><b>Google.accompanist.pager</b></td><td><span title="Google.accompanist.pager.indicators
com.google.accompanist:accompanist-pager-indicators:_
version.google.accompanist" style="text-decoration: underline;" >indicators</span>&nbsp;</td></tr>
<tr><td><b>Google.accompanist.placeholder</b></td><td><span title="Google.accompanist.placeholder.material
com.google.accompanist:accompanist-placeholder-material:_
version.google.accompanist" style="text-decoration: underline;" >material</span>&nbsp;</td></tr>
<tr><td><b>Google.android</b></td><td><span title="Google.android.flexbox
com.google.android.flexbox:flexbox:_
version.google.android.flexbox" style="text-decoration: underline;" >flexbox</span>&nbsp; - <span title="Google.android.openSourceLicensesPlugin
Expand Down
29 changes: 22 additions & 7 deletions plugins/dependencies/src/main/kotlin/dependencies/Google.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,42 @@ object Google : IsNotADependency {

object Accompanist : DependencyGroup(group = "com.google.accompanist") {

val glide = module("accompanist-glide")
val imageloadingCore = module("accompanist-imageloading-core")

val insets = Insets

object Insets : DependencyNotationAndGroup(group = "com.google.accompanist", name = "accompanist-insets") {
val ui = module("accompanist-insets-ui")
}

val systemuicontroller = module("accompanist-systemuicontroller")
val systemUiController = module("accompanist-systemuicontroller")

val appcompatTheme = module("accompanist-appcompat-theme")
val appCompatTheme = module("accompanist-appcompat-theme")

val pager = Pager

object Pager : DependencyNotationAndGroup(group = "com.google.accompanist", name = "accompanist-pager") {
val indicators = module("accompanist-pager-indicators")
}

val flowlayout = module("accompanist-flowlayout")
val swiperefresh = module("accompanist-swiperefresh")
val flowLayout = module("accompanist-flowlayout")
val swipeRefresh = module("accompanist-swiperefresh")

val placeholder = Placeholder

object Placeholder : DependencyNotationAndGroup(
group = "com.google.accompanist",
name = "accompanist-placeholder"
) {
val material = module("accompanist-placeholder-material")
}

val drawablePainter = module("accompanist-drawablepainter")

val permissions = module("accompanist-permissions")

val navigationMaterial = module("accompanist-navigation-material")
val navigationAnimation = module("accompanist-navigation-animation")

val webView = module("accompanist-webview")
}

val android = Android
Expand Down
6 changes: 6 additions & 0 deletions plugins/dependencies/src/main/resources/refreshVersions-rules/google-version-alias-rules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ com.google.firebase:firebase-*
com.google.accompanist:accompanist-*
^^^^^^.^^^^^^^^^^^

com.google.accompanist:accompanist-imageloading-core
^^^^^^.^^^^^^^^^^^. ^^^^^^^^^^^^^^^^^

com.google.accompanist:accompanist-glide
^^^^^^.^^^^^^^^^^^. ^^^^^

com.google.android.libraries.places:places
^^^^^^.^^^^^^^. ^^^^^^

Expand Down
24 changes: 24 additions & 0 deletions plugins/dependencies/src/main/resources/removals-revisions-history.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,3 +679,27 @@ id:[androidx.lifecycle:lifecycle-runtime-testing]
// FIXME: Replace with new artifact.
moved:[androidx.health.connect:connect-client]
id:[androidx.health:health-connect-client]

## Revision 14

~~Google.accompanist.glide~~
// The Glide module was deprecated and got removed in version 0.16.0
// FIXME: Replace with Coil Compose.
id:[com.google.accompanist:accompanist-glide]

~~Google.accompanist.imageloadingCore~~
// The imageloading module was deprecated and got removed in version 0.16.0
// FIXME: Replace with Coil Compose.
id:[com.google.accompanist:accompanist-imageloading-core]

~~Google.accompanist.appcompatTheme~~
id:[com.google.accompanist:accompanist-appcompat-theme]

~~Google.accompanist.flowlayout~~
id:[com.google.accompanist:accompanist-flowlayout]

~~Google.accompanist.swiperefresh~~
id:[com.google.accompanist:accompanist-swiperefresh]

~~Google.accompanist.systemuicontroller~~
id:[com.google.accompanist:accompanist-systemuicontroller]
2 changes: 2 additions & 0 deletions plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,5 @@ io.ktor..ktor-locations=version.ktor
io.ktor..ktor-metrics=version.ktor
io.ktor..ktor-velocity=version.ktor
androidx.health..health-connect-client=version.androidx.health-connect-client
com.google.accompanist..accompanist-glide=version.google.accompanist
com.google.accompanist..accompanist-imageloading-core=version.google.accompanist
9 changes: 7 additions & 2 deletions plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,20 @@ com.android.tools:r8
com.github.chuckerteam.chucker:library
com.github.chuckerteam.chucker:library-no-op
com.google.accompanist:accompanist-appcompat-theme
com.google.accompanist:accompanist-drawablepainter
com.google.accompanist:accompanist-flowlayout
com.google.accompanist:accompanist-glide
com.google.accompanist:accompanist-imageloading-core
com.google.accompanist:accompanist-insets
com.google.accompanist:accompanist-insets-ui
com.google.accompanist:accompanist-navigation-animation
com.google.accompanist:accompanist-navigation-material
com.google.accompanist:accompanist-pager
com.google.accompanist:accompanist-pager-indicators
com.google.accompanist:accompanist-permissions
com.google.accompanist:accompanist-placeholder
com.google.accompanist:accompanist-placeholder-material
com.google.accompanist:accompanist-swiperefresh
com.google.accompanist:accompanist-systemuicontroller
com.google.accompanist:accompanist-webview
com.google.android.fhir:data-capture
com.google.android.fhir:engine
com.google.android.fhir:workflow
Expand Down
17 changes: 11 additions & 6 deletions plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,16 +343,21 @@ com.android.tools..r8=Android.tools.r8
com.android.tools.build..gradle=Android.tools.build.gradlePlugin
com.github.chuckerteam.chucker..library-no-op=Chucker.libraryNoOp
com.github.chuckerteam.chucker..library=Chucker.library
com.google.accompanist..accompanist-appcompat-theme=Google.accompanist.appcompatTheme
com.google.accompanist..accompanist-flowlayout=Google.accompanist.flowlayout
com.google.accompanist..accompanist-glide=Google.accompanist.glide
com.google.accompanist..accompanist-imageloading-core=Google.accompanist.imageloadingCore
com.google.accompanist..accompanist-appcompat-theme=Google.accompanist.appCompatTheme
com.google.accompanist..accompanist-drawablepainter=Google.accompanist.drawablePainter
com.google.accompanist..accompanist-flowlayout=Google.accompanist.flowLayout
com.google.accompanist..accompanist-insets-ui=Google.accompanist.insets.ui
com.google.accompanist..accompanist-insets=Google.accompanist.insets
com.google.accompanist..accompanist-navigation-animation=Google.accompanist.navigationAnimation
com.google.accompanist..accompanist-navigation-material=Google.accompanist.navigationMaterial
com.google.accompanist..accompanist-pager-indicators=Google.accompanist.pager.indicators
com.google.accompanist..accompanist-pager=Google.accompanist.pager
com.google.accompanist..accompanist-swiperefresh=Google.accompanist.swiperefresh
com.google.accompanist..accompanist-systemuicontroller=Google.accompanist.systemuicontroller
com.google.accompanist..accompanist-permissions=Google.accompanist.permissions
com.google.accompanist..accompanist-placeholder-material=Google.accompanist.placeholder.material
com.google.accompanist..accompanist-placeholder=Google.accompanist.placeholder
com.google.accompanist..accompanist-swiperefresh=Google.accompanist.swipeRefresh
com.google.accompanist..accompanist-systemuicontroller=Google.accompanist.systemUiController
com.google.accompanist..accompanist-webview=Google.accompanist.webView
com.google.android.fhir..data-capture=Google.android.fhir.dataCapture
com.google.android.fhir..engine=Google.android.fhir.engine
com.google.android.fhir..workflow=Google.android.fhir.workflow
Expand Down
9 changes: 7 additions & 2 deletions plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,20 @@ com.android.tools.build..gradle=version.NO-RULE
com.github.chuckerteam.chucker..library-no-op=version.chucker
com.github.chuckerteam.chucker..library=version.chucker
com.google.accompanist..accompanist-appcompat-theme=version.google.accompanist
com.google.accompanist..accompanist-drawablepainter=version.google.accompanist
com.google.accompanist..accompanist-flowlayout=version.google.accompanist
com.google.accompanist..accompanist-glide=version.google.accompanist
com.google.accompanist..accompanist-imageloading-core=version.google.accompanist
com.google.accompanist..accompanist-insets-ui=version.google.accompanist
com.google.accompanist..accompanist-insets=version.google.accompanist
com.google.accompanist..accompanist-navigation-animation=version.google.accompanist
com.google.accompanist..accompanist-navigation-material=version.google.accompanist
com.google.accompanist..accompanist-pager-indicators=version.google.accompanist
com.google.accompanist..accompanist-pager=version.google.accompanist
com.google.accompanist..accompanist-permissions=version.google.accompanist
com.google.accompanist..accompanist-placeholder-material=version.google.accompanist
com.google.accompanist..accompanist-placeholder=version.google.accompanist
com.google.accompanist..accompanist-swiperefresh=version.google.accompanist
com.google.accompanist..accompanist-systemuicontroller=version.google.accompanist
com.google.accompanist..accompanist-webview=version.google.accompanist
com.google.android.fhir..data-capture=version.google.android.fhir.data-capture
com.google.android.fhir..engine=version.google.android.fhir.engine
com.google.android.fhir..workflow=version.google.android.fhir.workflow
Expand Down