Migrated dependencies and plugins to version catalog (#1497)

This commit is contained in:
Tule Simon 2023-04-16 19:39:15 +01:00 committed by GitHub
parent 8136612eaa
commit 7e1ca1e211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 190 additions and 73 deletions

View file

@ -100,81 +100,75 @@ static def getProperty(Properties properties, String name) {
dependencies { dependencies {
implementation project(':appthemehelper') implementation project(':appthemehelper')
implementation "androidx.gridlayout:gridlayout:1.0.0" implementation libs.gridLayout
implementation "androidx.appcompat:appcompat:$appcompat_version" implementation libs.androidx.appcompat
implementation 'androidx.annotation:annotation:1.6.0' implementation libs.androidx.annotation
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation libs.androidx.constraintLayout
implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation libs.androidx.recyclerview
implementation "androidx.preference:preference-ktx:$preference_version" implementation libs.androidx.preference.ktx
implementation "androidx.core:core-ktx:$core_version" implementation libs.androidx.core.ktx
implementation 'androidx.palette:palette-ktx:1.0.0' implementation libs.androidx.palette.ktx
implementation 'androidx.mediarouter:mediarouter:1.3.1' implementation libs.androidx.mediarouter
//Cast Dependencies //Cast Dependencies
normalImplementation 'com.google.android.gms:play-services-cast-framework:21.3.0' normalImplementation libs.google.play.services.cast.framework
//WebServer by NanoHttpd //WebServer by NanoHttpd
normalImplementation "org.nanohttpd:nanohttpd:2.3.1" normalImplementation libs.nanohttpd
implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version" implementation libs.androidx.navigation.runtime.ktx
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" implementation libs.androidx.navigation.fragment.ktx
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" implementation libs.androidx.navigation.ui.ktx
def room_version = '2.5.1' implementation libs.androidx.room.runtime
implementation "androidx.room:room-runtime:$room_version" implementation libs.androidx.room.ktx
implementation "androidx.room:room-ktx:$room_version" ksp libs.androidx.room.compiler
ksp "androidx.room:room-compiler:$room_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation libs.androidx.lifecycle.viewmodel.ktx
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation libs.androidx.lifecycle.livedata.ktx
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" implementation libs.androidx.lifecycle.common.java8
implementation "androidx.core:core-splashscreen:1.0.0" implementation libs.androidx.core.splashscreen
normalImplementation 'com.google.android.play:feature-delivery:2.0.1' normalImplementation libs.google.feature.delivery
normalImplementation 'com.google.android.play:review:2.0.1' normalImplementation libs.google.play.review
implementation "com.google.android.material:material:$mdc_version" implementation libs.android.material
def retrofit_version = '2.9.0' implementation libs.retrofit
implementation "com.squareup.retrofit2:retrofit:$retrofit_version" implementation libs.retrofit.converter.gson
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" implementation libs.okhttp3.logging.interceptor
implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.9'
def material_dialog_version = "3.3.0" implementation libs.afollestad.material.dialogs.core
implementation "com.afollestad.material-dialogs:core:$material_dialog_version" implementation libs.afollestad.material.dialogs.input
implementation "com.afollestad.material-dialogs:input:$material_dialog_version" implementation libs.afollestad.material.dialogs.color
implementation "com.afollestad.material-dialogs:color:$material_dialog_version" implementation libs.afollestad.material.cab
implementation 'com.afollestad:material-cab:2.0.1' implementation libs.kotlinx.coroutines.android
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" implementation libs.koin.core
implementation libs.koin.android
def koin_version = '3.4.0' implementation libs.glide
implementation "io.insert-koin:koin-core:$koin_version" ksp libs.glide.ksp
implementation "io.insert-koin:koin-android:$koin_version" implementation libs.glide.okhttp3.integration
def glide_version = '4.15.1' implementation libs.advrecyclerview
implementation "com.github.bumptech.glide:glide:$glide_version"
ksp "com.github.bumptech.glide:ksp:$glide_version"
implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0' implementation libs.fadingedgelayout
implementation 'com.github.bosphere.android-fadingedgelayout:fadingedgelayout:1.0.0' implementation libs.keyboardvisibilityevent
implementation libs.jetradarmobile.android.snowfall
implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:3.0.0-RC3' implementation libs.chrisbanes.insetter
implementation 'com.github.jetradarmobile:android-snowfall:1.2.1'
implementation "dev.chrisbanes.insetter:insetter:0.6.1" implementation libs.org.eclipse.egit.github.core
implementation libs.jaudiotagger
implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5' normalImplementation libs.android.lab.library
implementation 'com.github.Adonai:jaudiotagger:2.3.15' implementation libs.slidableactivity
normalImplementation 'com.anjlab.android.iab.v3:library:2.0.3' implementation libs.material.intro
implementation 'com.r0adkll:slidableactivity:2.1.0' implementation libs.dhaval2404.imagepicker
implementation 'com.heinrichreimersoftware:material-intro:2.0.0' implementation libs.fastscroll.library
implementation 'com.github.dhaval2404:imagepicker:2.1' implementation libs.customactivityoncrash
implementation 'me.zhanghai.android.fastscroll:library:1.2.0' implementation libs.tankery.circularSeekBar
implementation 'cat.ereza:customactivityoncrash:2.4.0'
implementation 'me.tankery.lib:circularSeekBar:1.4.2'
} }

View file

@ -24,7 +24,7 @@ android {
} }
dependencies { dependencies {
implementation "androidx.appcompat:appcompat:$appcompat_version" implementation libs.androidx.appcompat
implementation "com.google.android.material:material:$mdc_version" implementation libs.android.material
implementation "androidx.preference:preference-ktx:$preference_version" implementation libs.androidx.preference.ktx
} }

View file

@ -1,28 +1,20 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext {
lifecycle_version = '2.6.1'
navigation_version = '2.5.3'
mdc_version = '1.9.0-beta01'
preference_version = '1.2.0'
appcompat_version = '1.6.1'
core_version = '1.10.0-rc01'
}
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.4.2' classpath libs.gradle
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10" classpath libs.kotlin.gradle.plugin
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" classpath libs.androidx.navigation.safeargs.plugin
} }
} }
plugins { plugins {
id "com.github.ben-manes.versions" version "0.46.0" alias libs.plugins.github.ben.manes
id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false alias libs.plugins.google.devtools.ksp apply false
} }
tasks.register('clean', Delete) { tasks.register('clean', Delete) {

131
gradle/libs.versions.toml Normal file
View file

@ -0,0 +1,131 @@
[versions]
#buildscripts dependencies
advrecyclerview = "1.0.0"
jetradarmobile_androidSnowfall_version = "1.2.1"
tankery_circularSeekBar_version = "1.4.2"
retrofit_version = "2.9.0"
afollestad_dialog_version = "3.3.0"
coreSplashscreen = "1.0.0"
customactivityoncrash = "2.4.0"
fadingedgelayout = "1.0.0"
google_featureDelivery_version = "2.0.1"
gradle = "7.4.2"
dhaval2404_imagepicker_version = "2.1"
chrisbanes_insetter_version = "0.6.1"
jaudiotagger = "2.3.15"
yslibrary_keyboardvisibilityevent_version = "3.0.0-RC3"
koinAndroid = "3.4.0"
kotlinGradlePlugin = "1.8.10"
kotlinxCoroutinesAndroid = "1.6.4"
android_tab_library_version = "2.0.3"
fast_scroll_libraryVersion = "1.2.0"
lifecycle_version = "2.6.1"
okhttp3_loggingInterceptor_version = "5.0.0-alpha.9"
afollestad_materialCab_version = "2.0.1"
materialIntro = "2.0.0"
mediarouter = "1.3.1"
nanohttpd = "2.3.1"
navigation_version = "2.5.3"
mdc_version = "1.9.0-beta01"
glide_version = "4.15.1"
orgEclipseEgitGithubCore = "2.1.5"
playServicesCastFramework = "21.3.0"
preference_version = "1.2.0"
appcompat_version = "1.6.1"
google_play_review_version = "2.0.1"
room_version = "2.5.1"
core_version = "1.10.0-rc01"
#plugins
devTools_ksp_version = "1.8.10-1.0.9"
ben_manes_versoin = "0.46.0"
slidableactivity = "2.1.0"
[libraries]
#dependencies
#navigation
androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation_version" }
androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation_version" }
androidx-navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation_version" }
#lifecycle
androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle_version" }
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle_version" }
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle_version" }
#room
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room_version" }
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room_version" }
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room_version" }
#google_play
google-feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "google_featureDelivery_version" }
google-play-services-cast-framework = { module = "com.google.android.gms:play-services-cast-framework", version.ref = "playServicesCastFramework" }
google-play-review = { module = "com.google.android.play:review", version.ref = "google_play_review_version" }
#glide
glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide_version" }
glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "glide_version" }
glide-okhttp3-integration = { module = "com.github.bumptech.glide:okhttp3-integration", version.ref = "glide_version" }
#koin
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinAndroid" }
koin-core = { module = "io.insert-koin:koin-core", version.ref = "koinAndroid" }
#material dialog
afollestad-material-dialogs-color = { module = "com.afollestad.material-dialogs:color", version.ref = "afollestad_dialog_version" }
afollestad-material-dialogs-core = { module = "com.afollestad.material-dialogs:core", version.ref = "afollestad_dialog_version" }
afollestad-material-dialogs-input = { module = "com.afollestad.material-dialogs:input", version.ref = "afollestad_dialog_version" }
afollestad-material-cab = { module = "com.afollestad:material-cab", version.ref = "afollestad_materialCab_version" }
#Retrofit and apos
retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit_version" }
okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3_loggingInterceptor_version" }
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit_version" }
#misc
gridLayout = { group = "androidx.gridlayout", name = "gridlayout", version = "1.0.0" }
android-material = { module = "com.google.android.material:material", version.ref = "mdc_version" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
advrecyclerview = { module = "com.h6ah4i.android.widget.advrecyclerview:advrecyclerview", version.ref = "advrecyclerview" }
fadingedgelayout = { module = "com.github.bosphere.android-fadingedgelayout:fadingedgelayout", version.ref = "fadingedgelayout" }
keyboardvisibilityevent = { module = "net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent", version.ref = "yslibrary_keyboardvisibilityevent_version" }
jetradarmobile-android-snowfall = { module = "com.github.jetradarmobile:android-snowfall", version.ref = "jetradarmobile_androidSnowfall_version" }
chrisbanes-insetter = { module = "dev.chrisbanes.insetter:insetter", version.ref = "chrisbanes_insetter_version" }
org-eclipse-egit-github-core = { module = "org.eclipse.mylyn.github:org.eclipse.egit.github.core", version.ref = "orgEclipseEgitGithubCore" }
jaudiotagger = { module = "com.github.Adonai:jaudiotagger", version.ref = "jaudiotagger" }
android-lab-library = { module = "com.anjlab.android.iab.v3:library", version.ref = "android_tab_library_version" }
slidableactivity = { module = "com.r0adkll:slidableactivity", version.ref = "slidableactivity" }
material-intro = { module = "com.heinrichreimersoftware:material-intro", version.ref = "materialIntro" }
dhaval2404-imagepicker = { module = "com.github.dhaval2404:imagepicker", version.ref = "dhaval2404_imagepicker_version" }
fastscroll-library = { module = "me.zhanghai.android.fastscroll:library", version.ref = "fast_scroll_libraryVersion" }
customactivityoncrash = { module = "cat.ereza:customactivityoncrash", version.ref = "customactivityoncrash" }
tankery-circularSeekBar = { module = "me.tankery.lib:circularSeekBar", version.ref = "tankery_circularSeekBar_version" }
androidx-mediarouter = { group = "androidx.mediarouter", name = "mediarouter", version.ref = "mediarouter" }
nanohttpd = { group = "org.nanohttpd", name = "nanohttpd", version.ref = "nanohttpd" }
#androidx
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat_version" }
androidx-annotation = { group = "androidx.annotation", name = "annotation", version = "1.6.0" }
androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.1.4" }
androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.0" }
androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference_version" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core_version" }
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
androidx-palette-ktx = { group = "androidx.palette", name = "palette-ktx", version = "1.0.0" }
#buildscripts dependencies
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
androidx-navigation-safeargs-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigation_version" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
[plugins]
github-ben-manes = { id = "com.github.ben-manes.versions", version.ref = "ben_manes_versoin" }
google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "devTools_ksp_version" }