From 6c6736fd0a86a416f35f16ad0840855b1776a1d9 Mon Sep 17 00:00:00 2001 From: Li ZongYing Date: Fri, 7 Jun 2024 17:22:42 +0800 Subject: [PATCH] gradle lib version --- HISTORY.md | 4 ++ app/build.gradle | 87 ++++++++++----------------------------- gradle/libs.versions.toml | 40 ++++++++++++++++++ version.json | 2 +- 4 files changed, 66 insertions(+), 67 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/HISTORY.md b/HISTORY.md index c900e660..6022bb52 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,9 @@ ## 更新日誌 +### v2.1.3 + +* + ### v2.1.2 * diff --git a/app/build.gradle b/app/build.gradle index 55390836..df3c2133 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,71 +98,26 @@ static def VersionName() { } } -def gson_version = "2.10.1" -def failureaccess_version = "1.0.2" -def guava_version = "33.2.1-android" - dependencies { - -// minSdk17 - def media3_version = "1.2.1" - - implementation "androidx.media3:media3-ui:$media3_version" - - // For media playback using ExoPlayer - implementation("com.google.guava:failureaccess:$failureaccess_version") - implementation("com.google.guava:guava:$guava_version") - implementation("androidx.media3:media3-common:$media3_version") { - exclude group: 'com.google.guava', module: 'guava' - exclude group: 'com.google.guava', module: 'failureaccess' - } - implementation("androidx.media3:media3-exoplayer:$media3_version") - - // For HLS playback support with ExoPlayer - implementation "androidx.media3:media3-exoplayer-hls:$media3_version" - - // 21:2.9.0 17:2.6.4 - def retrofit2_version = "2.6.4" - - implementation 'com.google.protobuf:protobuf-kotlin:3.25.1' - // Gson 2.10.1 and older: API level 19 - implementation("com.google.code.gson:gson:$gson_version") - implementation("com.squareup.retrofit2:converter-gson:$retrofit2_version") { - exclude group: 'com.google.code.gson', module: 'gson' - } - implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version" - implementation "com.squareup.retrofit2:retrofit:$retrofit2_version" - - implementation 'com.github.bumptech.glide:glide:4.11.0' - - implementation("androidx.work:work-runtime-ktx:2.9.0") - implementation 'androidx.core:core-ktx:1.11.0-beta02' - implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.leanback:leanback:1.2.0-alpha02' - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2" - implementation("androidx.constraintlayout:constraintlayout:2.1.4") - - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC") - - implementation 'javax.annotation:javax.annotation-api:1.3.2' -} - -configurations.configureEach { - resolutionStrategy { - force("com.google.code.gson:gson:$gson_version") - force "com.google.guava:failureaccess:$failureaccess_version" - force "com.google.guava:guava:$guava_version" - eachDependency { details -> - if (details.requested.group == 'com.google.code.gson') { - details.useVersion "$gson_version" - } - if (details.requested.group == 'com.google.guava' && details.requested.name == 'failureaccess') { - details.useVersion "$failureaccess_version" - } - if (details.requested.group == 'com.google.guava' && details.requested.name == 'guava') { - details.useVersion "$guava_version" - } - } - } + implementation(libs.media3.ui) + implementation(libs.failureaccess) + implementation(libs.guava) + implementation(libs.media3.common) + implementation(libs.media3.exoplayer) + implementation(libs.media3.exoplayer.hls) + implementation(libs.protobuf.kotlin) + implementation(libs.gson) + implementation(libs.converter.gson) + implementation(libs.converter.protobuf) + implementation(libs.retrofit) + implementation(libs.glide) + implementation(libs.work.runtime.ktx) + implementation(libs.core.ktx) + implementation(libs.multidex) + implementation(libs.leanback) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.constraintlayout) + implementation(libs.serialization.json) + implementation(libs.coroutines.android) + implementation(libs.javax.annotation.api) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..025d8dbf --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,40 @@ +[versions] +media3 = "1.2.1" # minSdk17 +gson = "2.10.1" # 2.10.1 and older: API level 19 +failureaccess = "1.0.2" +guava = "33.2.1-android" +retrofit = "2.6.4" # 21:2.9.0 17:2.6.4 +protobuf = "3.25.1" +glide = "4.11.0" +work = "2.9.0" +core_ktx = "1.11.0-beta02" +multidex = "2.0.1" +leanback = "1.2.0-alpha02" +lifecycle = "2.6.2" +constraintlayout = "2.1.4" +serialization = "1.6.2" +coroutines = "1.8.0-RC" +javax_annotation = "1.3.2" + +[libraries] +media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3" } +media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" } +media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" } +media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "media3" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +failureaccess = { module = "com.google.guava:failureaccess", version.ref = "failureaccess" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } +converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } +converter-protobuf = { module = "com.squareup.retrofit2:converter-protobuf", version.ref = "retrofit" } +protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" } +glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } +work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" } +core-ktx = { module = "androidx.core:core-ktx", version.ref = "core_ktx" } +multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" } +leanback = { module = "androidx.leanback:leanback", version.ref = "leanback" } +lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" } +constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } +serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } +coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } +javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax_annotation" } diff --git a/version.json b/version.json index 3c6d0fe2..8300635d 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version_code": 33620480, "version_name": "v2.1.2"} +{"version_code": 33620736, "version_name": "v2.1.3"}