From 5978aab0aa20a8eb63a63dab73ad81e8656213e4 Mon Sep 17 00:00:00 2001 From: Michatec Date: Tue, 24 Mar 2026 12:28:15 +0100 Subject: [PATCH] - New Version Released. - Updated the Gradle Structure. - libs.versions.toml added. --- app/build.gradle | 40 ++++++++++++++++++------------------- build.gradle | 6 +++--- gradle/libs.versions.toml | 42 +++++++++++++++++++++++++++++++++++++++ gradlew | 2 +- 4 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/app/build.gradle b/app/build.gradle index fa5f294..88341dc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.android.application' + alias libs.plugins.android.application id 'kotlin-parcelize' } @@ -19,8 +19,8 @@ android { applicationId 'com.michatec.radio' minSdk 28 targetSdk 36 - versionCode 142 - versionName '14.2' + versionCode 143 + versionName '14.3' resourceConfigurations += ['en', 'de', 'el', 'nl', 'pl', 'ru','uk', 'ja', 'da', 'fr'] } @@ -55,26 +55,26 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Google Stuff // - implementation 'com.google.android.material:material:1.13.0' - implementation 'com.google.code.gson:gson:2.13.2' + implementation libs.material + implementation libs.gson // AndroidX Stuff // - implementation 'androidx.core:core-ktx:1.18.0' - implementation 'androidx.activity:activity-ktx:1.13.0' - implementation 'androidx.palette:palette-ktx:1.0.0' - implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.media:media:1.7.1' - implementation 'androidx.media3:media3-exoplayer:1.9.3' - implementation 'androidx.media3:media3-exoplayer-hls:1.9.3' - implementation 'androidx.media3:media3-session:1.9.3' - implementation 'androidx.media3:media3-datasource-okhttp:1.9.3' - implementation 'androidx.navigation:navigation-fragment-ktx:2.9.7' - implementation 'androidx.navigation:navigation-ui-ktx:2.9.7' - implementation 'androidx.work:work-runtime-ktx:2.11.1' + implementation libs.core.ktx + implementation libs.activity.ktx + implementation libs.palette.ktx + implementation libs.preference.ktx + implementation libs.media + implementation libs.media3.exoplayer + implementation libs.media3.exoplayer.hls + implementation libs.media3.session + implementation libs.media3.datasource.okhttp + implementation libs.navigation.fragment.ktx + implementation libs.navigation.ui.ktx + implementation libs.work.runtime.ktx - implementation 'com.github.woheller69:FreeDroidWarn:V1.10' + implementation libs.freedroidwarn // Volley HTTP request // - implementation 'com.android.volley:volley:1.2.1' - implementation 'androidx.compose.material3:material3:1.4.0' + implementation libs.volley + implementation libs.material3 } diff --git a/build.gradle b/build.gradle index 60eecc0..81c1d19 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '9.1.0' apply false - id 'com.android.library' version '9.1.0' apply false - id 'org.jetbrains.kotlin.android' version "2.3.20" apply false + alias libs.plugins.android.application apply false + alias libs.plugins.android.library apply false + alias libs.plugins.jetbrains.kotlin.android apply false } tasks.register('clean', Delete) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..d167b52 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,42 @@ +[versions] +activityKtx = "1.13.0" +agp = "9.1.0" +coreKtx = "1.18.0" +freedroidwarn = "V1.10" +gradleToolchainsFoojayResolverConvention = "1.0.0" +gson = "2.13.2" +kotlin = "2.3.20" +material = "1.13.0" +material3 = "1.4.0" +media = "1.7.1" +media3 = "1.9.3" +navigation = "2.9.7" +paletteKtx = "1.0.0" +preferenceKtx = "1.2.1" +volley = "1.2.1" +workRuntimeKtx = "2.11.1" + +[libraries] +activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activityKtx" } +core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +freedroidwarn = { group = "com.github.woheller69", name = "FreeDroidWarn", version.ref = "freedroidwarn" } +gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } +media = { group = "androidx.media", name = "media", version.ref = "media" } +media3-datasource-okhttp = { group = "androidx.media3", name = "media3-datasource-okhttp", version.ref = "media3" } +media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3" } +media3-exoplayer-hls = { group = "androidx.media3", name = "media3-exoplayer-hls", version.ref = "media3" } +media3-session = { group = "androidx.media3", name = "media3-session", version.ref = "media3" } +navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" } +navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" } +palette-ktx = { group = "androidx.palette", name = "palette-ktx", version.ref = "paletteKtx" } +preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preferenceKtx" } +volley = { group = "com.android.volley", name = "volley", version.ref = "volley" } +work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "workRuntimeKtx" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } +foojay = { id = "org.gradle.toolchains.foojay-resolver-convention", version.ref = "gradleToolchainsFoojayResolverConvention" } +jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } diff --git a/gradlew b/gradlew index 739907d..0262dcb 100644 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/.