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

Use gradle version catalog #564

Merged
merged 8 commits into from
Feb 15, 2024
Merged

Use gradle version catalog #564

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5510f3d
Using version catalog
ArnyminerZ Feb 12, 2024
ee06720
Fixed library names
ArnyminerZ Feb 12, 2024
eb7835d
Remove lifecycle-ext
rfc2822 Feb 15, 2024
3956718
Rename, reorder
rfc2822 Feb 15, 2024
42837d6
Remove unnecessary entries
rfc2822 Feb 15, 2024
ba96ced
Use BOM for Compose again
rfc2822 Feb 15, 2024
8e6c4f8
Try to fix BOM
rfc2822 Feb 15, 2024
bee06d4
Merge branch 'dev-ose' into 484-use-version-catalog
rfc2822 Feb 15, 2024
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
Prev Previous commit
Next Next commit
Fixed library names 
Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>
  • Loading branch information
@ArnyminerZ
ArnyminerZ committed Feb 12, 2024
commit ee06720123f444fabcd591663eb8827cff857340
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ okhttp = "4.12.0"
room = "2.6.1"

[libraries]
aboutLibs-compose = { module = "com.mikepenz.aboutlibraries:aboutlibraries-compose", version.ref = "aboutLibs" }
aboutLibs-compose = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "aboutLibs" }
androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidx-arch" }
Expand All @@ -87,24 +87,24 @@ androidx-work-base = { module = "androidx.work:work-runtime-ktx", version.ref =
androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidx-work" }
appauth = { module = "net.openid:appauth", version.ref = "appauth" }
appintro = { module = "com.github.AppIntro:AppIntro", version.ref = "appIntro" }
bitfire-cert4android = { module = "com.bitfire.bitfireAT:cert4android", version.ref = "bitfire-cert4android" }
bitfire-dav4jvm = { module = "com.bitfire.bitfireAT:dav4jvm", version.ref = "bitfire-dav4jvm" }
bitfire-ical4android = { module = "com.bitfire.bitfireAT:ical4android", version.ref = "bitfire-ical4android" }
bitfire-vcard4android = { module = "com.bitfire.bitfireAT:vcard4android", version.ref = "bitfire-vcard4android" }
bitfire-cert4android = { module = "com.github.bitfireAT:cert4android", version.ref = "bitfire-cert4android" }
bitfire-dav4jvm = { module = "com.github.bitfireAT:dav4jvm", version.ref = "bitfire-dav4jvm" }
bitfire-ical4android = { module = "com.github.bitfireAT:ical4android", version.ref = "bitfire-ical4android" }
bitfire-vcard4android = { module = "com.github.bitfireAT:vcard4android", version.ref = "bitfire-vcard4android" }
commons-collections = { module = "org.apache.commons:commons-collections4", version.ref = "commons-collections" }
commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
commons-lang = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang" }
commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
compose-accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "compose-accompanist" }
compose-accompanist-themeAdapter = { module = "com.google.accompanist:accompanist-themeadapter", version.ref = "compose-accompanist" }
compose-accompanist-themeAdapter = { module = "com.google.accompanist:accompanist-themeadapter-material", version.ref = "compose-accompanist" }
compose-material = { module = "androidx.compose.material:material", version.ref = "compose-material" }
compose-materialIconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose-material" }
compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata", version.ref = "compose-runtime" }
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui" }
compose-ui-toolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-ui" }
desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugaring" }
dnsjava = { module = "dnsjava:dnsjava", version.ref = "dnsjava" }
flexbox = { module = "com.google.android:flexbox", version.ref = "flexbox" }
flexbox = { module = "com.google.android.flexbox:flexbox", version.ref = "flexbox" }
hilt-android-base = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
Expand All @@ -117,7 +117,7 @@ kstatemachine = { module = "io.github.nsk90:kstatemachine-jvm", version.ref = "k
material = { module = "com.google.android.material:material", version.ref = "material" }
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
okhttp-base = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
okhttp-brotli = { module = "com.brsanthu:okhttp-brotli", version.ref = "okhttp" }
okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp" }
okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
room-base = { module = "androidx.room:room-ktx", version.ref = "room" }
Expand Down
Loading