From 36c62ae89de995e4d9850e2301a65865816bf776 Mon Sep 17 00:00:00 2001 From: Con Momberg Date: Thu, 8 Dec 2022 14:50:37 +0200 Subject: [PATCH 1/3] [Issue #512] Added dependency notations for Glide. --- .../refreshVersions/RefreshVersionsPlugin.kt | 1 + .../src/main/kotlin/dependencies/BumpTech.kt | 68 +++++++++++++++++++ .../src/main/kotlin/dependencies/_ALL.kt | 2 + .../bumptech-version-alias-rules.txt | 8 +++ 4 files changed, 79 insertions(+) create mode 100644 plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt create mode 100644 plugins/dependencies/src/main/resources/refreshVersions-rules/bumptech-version-alias-rules.txt diff --git a/plugins/dependencies/src/main/kotlin/de/fayard/refreshVersions/RefreshVersionsPlugin.kt b/plugins/dependencies/src/main/kotlin/de/fayard/refreshVersions/RefreshVersionsPlugin.kt index af9ec154b..84b5308dd 100644 --- a/plugins/dependencies/src/main/kotlin/de/fayard/refreshVersions/RefreshVersionsPlugin.kt +++ b/plugins/dependencies/src/main/kotlin/de/fayard/refreshVersions/RefreshVersionsPlugin.kt @@ -23,6 +23,7 @@ open class RefreshVersionsPlugin : Plugin { internal val artifactVersionKeyRulesFileNames: List = listOf( "androidx-version-alias-rules.txt", + "bumptech-version-alias-rules.txt", "cashapp-version-alias-rules.txt", "dependency-groups-alias-rules.txt", "google-version-alias-rules.txt", diff --git a/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt b/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt new file mode 100644 index 000000000..7bc486b0a --- /dev/null +++ b/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt @@ -0,0 +1,68 @@ +@file:Suppress("PackageDirectoryMismatch", "SpellCheckingInspection", "unused") + +import de.fayard.refreshVersions.core.DependencyNotationAndGroup +import org.gradle.kotlin.dsl.IsNotADependency + +object BumpTech : IsNotADependency { + + /** + * Glide is a fast and efficient open source media management and image loading framework for Android. Glide offers an easy to use API, + * a performant and extensible resource decoding pipeline and automatic resource pooling. + * + * [Official website](https://bumptech.github.io/glide) + * + * GitHub page: [bumptech/glide](https://github.com/bumptech/glide) + */ + val glide = Glide + + object Glide : DependencyNotationAndGroup(group = "com.github.bumptech.glide", name = "glide") { + + /** A set of annotations for configuring Glide. */ + val annotations = module("annotations") + + /** An integration library to support AVIF images in Glide. */ + val avif = module("avif-integration") + + /** Glide's anntation processor. */ + val compiler = module("compiler") + + /** An integration library to integrate with Jetpack Compose. */ + val compose = module("compose") + + /** An integration library for using Glide with [`ListenableFutures`](https://developer.android.com/guide/background/listenablefuture). */ + val concurrent = module("concurrent-integration") + + /** An integration library to use Cronet to fetch data over HTTP/HTTPS in Glide. */ + val cronet = module("cronet-integration") + + /** A cache that uses a bounded amount of space on a filesystem. Based on Jake Wharton's tailored for Glide. */ + val diskLruCache = module("disklrucache") + + /** An integration library allowing users to re-encode or create animated GIFs. */ + val gifEncoder = module("gifencoder-integration") + + /** Implementation of GifDecoder that is more memory efficient to animate for Android devices. */ + val gifDecoder = module("gifdecoder") + + /** Glide's KSP based annotation processor. */ + val ksp = module("ksp") + + /** An integration library to improve Kotlin interop with Glide. */ + val ktx = module("ktx") + + /** A set of mocks to ease testing with Glide. */ + val mocks = module("mocks") + + /** An integration library to use OkHttp 2.x to fetch data over HTTP/HTTPS in Glide. */ + val okhttp = module("okhttp-integration") + + /** An integration library to use OkHttp 3.x to fetch data over HTTP/HTTPS in Glide. */ + val okhttp3 = module("okhttp3-integration") + + /** An integration library to display images in `RecyclerView`. */ + val recyclerView = module("recyclerView-integration") + + /** An integration library to use Volley to fetch data over HTTP/HTTPS in Glide. */ + val volley = module("concurrent-integration") + } +} diff --git a/plugins/dependencies/src/main/kotlin/dependencies/_ALL.kt b/plugins/dependencies/src/main/kotlin/dependencies/_ALL.kt index 0297e75e0..0b117a54b 100644 --- a/plugins/dependencies/src/main/kotlin/dependencies/_ALL.kt +++ b/plugins/dependencies/src/main/kotlin/dependencies/_ALL.kt @@ -6,6 +6,7 @@ import Android import AndroidX import ApolloGraphQL import Arrow +import BumpTech import COIL import CashApp import Chucker @@ -35,6 +36,7 @@ internal val ALL_DEPENDENCIES_NOTATIONS = listOf( AndroidX, ApolloGraphQL, Arrow, + BumpTech, CashApp, Chucker, COIL, diff --git a/plugins/dependencies/src/main/resources/refreshVersions-rules/bumptech-version-alias-rules.txt b/plugins/dependencies/src/main/resources/refreshVersions-rules/bumptech-version-alias-rules.txt new file mode 100644 index 000000000..40c1e5c05 --- /dev/null +++ b/plugins/dependencies/src/main/resources/refreshVersions-rules/bumptech-version-alias-rules.txt @@ -0,0 +1,8 @@ +com.github.bumptech.glide:* + ^^^^^^^^^^^^^^ + +com.github.bumptech.glide:compose + ^^^^^^^^^^^^^^.^^^^^^^ + +com.github.bumptech.glide:ktx + ^^^^^^^^^^^^^^.^^^ From e8cc3baf0f658c56d9879dd836cf55f1a16350c8 Mon Sep 17 00:00:00 2001 From: Con Momberg Date: Thu, 8 Dec 2022 19:32:33 +0200 Subject: [PATCH 2/3] [Issue #512] Fixed 2 dependencies (Volley and RecyclerView integration), added BumpTech section to docs and ran tests for the generated mappings. --- docs/dependency-notations.md | 115 +++++++++++++++++- .../src/main/kotlin/dependencies/BumpTech.kt | 8 +- .../removed-dependencies-versions-keys.txt | 1 + .../bundled-dependencies-validated.txt | 17 +++ .../dependencies-mapping-validated.txt | 17 +++ .../dependencies-versions-key-validated.txt | 19 ++- 6 files changed, 171 insertions(+), 6 deletions(-) diff --git a/docs/dependency-notations.md b/docs/dependency-notations.md index 39e84911d..7eacf3b39 100644 --- a/docs/dependency-notations.md +++ b/docs/dependency-notations.md @@ -2431,7 +2431,120 @@ Hover 🐁 on a dependency notation to see its `Triple(KotlinName, MavenCoordina - + + +## [BumpTech.kt](https://github.com/jmfayard/refreshVersions/blob/main/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt) + + + + + + + +
Group Dependency Notations
BumpTech + + glide + +
BumpTech.glide + + annotations + + - + + avif + + - + + compiler + + - + + compose + + - + + concurrent + + - + + cronet + + - + + diskLruCache + + - + + gifEncoder + + - + + gifDecoder + + - + + ksp + + - + + ktx + + - + + mocks + + - + + okhttp + + - + + okhttp3 + + - + + recyclerView + + - + + volley + +
+ ## [COIL.kt](https://github.com/jmfayard/refreshVersions/blob/main/plugins/dependencies/src/main/kotlin/dependencies/COIL.kt) diff --git a/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt b/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt index 7bc486b0a..6ce61e4a7 100644 --- a/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt +++ b/plugins/dependencies/src/main/kotlin/dependencies/BumpTech.kt @@ -23,7 +23,7 @@ object BumpTech : IsNotADependency { /** An integration library to support AVIF images in Glide. */ val avif = module("avif-integration") - /** Glide's anntation processor. */ + /** Glide's annotation processor. */ val compiler = module("compiler") /** An integration library to integrate with Jetpack Compose. */ @@ -35,7 +35,7 @@ object BumpTech : IsNotADependency { /** An integration library to use Cronet to fetch data over HTTP/HTTPS in Glide. */ val cronet = module("cronet-integration") - /** A cache that uses a bounded amount of space on a filesystem. Based on Jake Wharton's tailored for Glide. */ + /** A cache that uses a bounded amount of space on a filesystem. Based on Jake Wharton's, tailored for Glide. */ val diskLruCache = module("disklrucache") /** An integration library allowing users to re-encode or create animated GIFs. */ @@ -60,9 +60,9 @@ object BumpTech : IsNotADependency { val okhttp3 = module("okhttp3-integration") /** An integration library to display images in `RecyclerView`. */ - val recyclerView = module("recyclerView-integration") + val recyclerView = module("recyclerview-integration") /** An integration library to use Volley to fetch data over HTTP/HTTPS in Glide. */ - val volley = module("concurrent-integration") + val volley = module("volley-integration") } } diff --git a/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt index 448234ad5..eab60f21d 100644 --- a/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt +++ b/plugins/dependencies/src/main/resources/removed-dependencies-versions-keys.txt @@ -107,3 +107,4 @@ 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 app.cash.molecule..molecule-testing=version.app.cash.molecule +androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime diff --git a/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt b/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt index 844e6f125..73f70ff8d 100644 --- a/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt +++ b/plugins/dependencies/src/test/resources/bundled-dependencies-validated.txt @@ -362,6 +362,23 @@ com.apollographql.apollo3:apollo-normalized-cache com.apollographql.apollo3:apollo-normalized-cache-sqlite com.apollographql.apollo3:apollo-runtime com.apollographql.apollo3:apollo-testing-support +com.github.bumptech.glide:annotations +com.github.bumptech.glide:avif-integration +com.github.bumptech.glide:compiler +com.github.bumptech.glide:compose +com.github.bumptech.glide:concurrent-integration +com.github.bumptech.glide:cronet-integration +com.github.bumptech.glide:disklrucache +com.github.bumptech.glide:gifdecoder +com.github.bumptech.glide:gifencoder-integration +com.github.bumptech.glide:glide +com.github.bumptech.glide:ksp +com.github.bumptech.glide:ktx +com.github.bumptech.glide:mocks +com.github.bumptech.glide:okhttp-integration +com.github.bumptech.glide:okhttp3-integration +com.github.bumptech.glide:recyclerview-integration +com.github.bumptech.glide:volley-integration com.github.chuckerteam.chucker:library com.github.chuckerteam.chucker:library-no-op com.google.accompanist:accompanist-appcompat-theme diff --git a/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt b/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt index 212e38682..29dee8e16 100644 --- a/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt +++ b/plugins/dependencies/src/test/resources/dependencies-mapping-validated.txt @@ -363,6 +363,23 @@ com.apollographql.apollo3..apollo-normalized-cache-sqlite=ApolloGraphQL.normaliz com.apollographql.apollo3..apollo-normalized-cache=ApolloGraphQL.normalizedCache com.apollographql.apollo3..apollo-runtime=ApolloGraphQL.runtime com.apollographql.apollo3..apollo-testing-support=ApolloGraphQL.testingSupport +com.github.bumptech.glide..annotations=BumpTech.glide.annotations +com.github.bumptech.glide..avif-integration=BumpTech.glide.avif +com.github.bumptech.glide..compiler=BumpTech.glide.compiler +com.github.bumptech.glide..compose=BumpTech.glide.compose +com.github.bumptech.glide..concurrent-integration=BumpTech.glide.concurrent +com.github.bumptech.glide..cronet-integration=BumpTech.glide.cronet +com.github.bumptech.glide..disklrucache=BumpTech.glide.diskLruCache +com.github.bumptech.glide..gifdecoder=BumpTech.glide.gifDecoder +com.github.bumptech.glide..gifencoder-integration=BumpTech.glide.gifEncoder +com.github.bumptech.glide..glide=BumpTech.glide +com.github.bumptech.glide..ksp=BumpTech.glide.ksp +com.github.bumptech.glide..ktx=BumpTech.glide.ktx +com.github.bumptech.glide..mocks=BumpTech.glide.mocks +com.github.bumptech.glide..okhttp-integration=BumpTech.glide.okhttp +com.github.bumptech.glide..okhttp3-integration=BumpTech.glide.okhttp3 +com.github.bumptech.glide..recyclerview-integration=BumpTech.glide.recyclerView +com.github.bumptech.glide..volley-integration=BumpTech.glide.volley 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 diff --git a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt index 270347229..a61e595b6 100644 --- a/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt +++ b/plugins/dependencies/src/test/resources/dependencies-versions-key-validated.txt @@ -58,7 +58,7 @@ androidx.compose.runtime..runtime-livedata=version.androidx.compose.runtime androidx.compose.runtime..runtime-rxjava2=version.androidx.compose.runtime androidx.compose.runtime..runtime-rxjava3=version.androidx.compose.runtime androidx.compose.runtime..runtime-saveable=version.androidx.compose.runtime -androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime +androidx.compose.runtime..runtime-tracing=version.androidx.compose.runtime-tracing androidx.compose.runtime..runtime=version.androidx.compose.runtime androidx.compose.ui..ui-geometry=version.androidx.compose.ui androidx.compose.ui..ui-graphics=version.androidx.compose.ui @@ -362,6 +362,23 @@ com.apollographql.apollo3..apollo-normalized-cache-sqlite=version.apollographql com.apollographql.apollo3..apollo-normalized-cache=version.apollographql com.apollographql.apollo3..apollo-runtime=version.apollographql com.apollographql.apollo3..apollo-testing-support=version.apollographql +com.github.bumptech.glide..annotations=version.bumptech.glide +com.github.bumptech.glide..avif-integration=version.bumptech.glide +com.github.bumptech.glide..compiler=version.bumptech.glide +com.github.bumptech.glide..compose=version.bumptech.glide.compose +com.github.bumptech.glide..concurrent-integration=version.bumptech.glide +com.github.bumptech.glide..cronet-integration=version.bumptech.glide +com.github.bumptech.glide..disklrucache=version.bumptech.glide +com.github.bumptech.glide..gifdecoder=version.bumptech.glide +com.github.bumptech.glide..gifencoder-integration=version.bumptech.glide +com.github.bumptech.glide..glide=version.bumptech.glide +com.github.bumptech.glide..ksp=version.bumptech.glide +com.github.bumptech.glide..ktx=version.bumptech.glide.ktx +com.github.bumptech.glide..mocks=version.bumptech.glide +com.github.bumptech.glide..okhttp-integration=version.bumptech.glide +com.github.bumptech.glide..okhttp3-integration=version.bumptech.glide +com.github.bumptech.glide..recyclerview-integration=version.bumptech.glide +com.github.bumptech.glide..volley-integration=version.bumptech.glide 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 From b63f9dc53248e80761fa8769599c22b384f1e575 Mon Sep 17 00:00:00 2001 From: Con Momberg Date: Thu, 8 Dec 2022 19:36:51 +0200 Subject: [PATCH 3/3] [Issue #512] Fixed stats in docs. --- docs/dependency-notations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/dependency-notations.md b/docs/dependency-notations.md index 7eacf3b39..a3765697c 100644 --- a/docs/dependency-notations.md +++ b/docs/dependency-notations.md @@ -3,7 +3,7 @@ title: Built-in Dependency Notations --- # Built-in Dependency Notations -[**refreshVersions**](https://github.com/jmfayard/refreshVersions) provides **1180** Dependency Notations in **26** groups and **249** subgroups +[**refreshVersions**](https://github.com/jmfayard/refreshVersions) provides **1197** Dependency Notations in **27** groups and **250** subgroups **Built-in Dependency Notations** are maven coordinates of popular libraries, discoverable as for example `KotlinX.coroutines.core` in IntelliJ IDEA,