From bdd204d9de94c1c4f0cc01c320664be9f4c35572 Mon Sep 17 00:00:00 2001 From: Michatec Date: Tue, 24 Mar 2026 13:07:06 +0100 Subject: [PATCH] - Migrate dependencies to Version Catalog (libs.versions.toml) - Update Kotlin to 2.3.20 and Jackson Core to 2.21.2 - Update Gradle Wrapper to 9.4.1 - Bump version code to 17 and version name to 1.7 - Remove unused `percentTranslationY` property from `FragmentLinearLayout` - Clean up semicolons in `MainApplication.kt` - Update `.gitignore` to include `gradle-daemon-jvm.properties` --- .gitignore | 1 + build.gradle | 28 ++++++++--------- gradle/libs.versions.toml | 30 +++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- .../com/michatec/store/MainApplication.kt | 4 +-- .../store/widget/FragmentLinearLayout.kt | 7 ----- 7 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/.gitignore b/.gitignore index 569393f..a1286d8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ !/proguard.pro !/README.md !/src +/gradle/gradle-daemon-jvm.properties diff --git a/build.gradle b/build.gradle index 779317a..b5f03bf 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:9.1.0' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10' + classpath libs.gradle + classpath libs.kotlin.gradle.plugin } } @@ -21,8 +21,8 @@ android { applicationId 'com.michatec.store' minSdk 30 targetSdk 36 - versionCode 16 - versionName '1.6' + versionCode 17 + versionName '1.7' def languages = [ 'en' ] buildConfigField 'String[]', 'LANGUAGES', '{ "' + languages.join('", "') + '" }' @@ -100,14 +100,14 @@ repositories { } dependencies { - implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.3.10' - implementation 'androidx.fragment:fragment-ktx:1.8.9' - implementation 'androidx.viewpager2:viewpager2:1.1.0' - implementation 'androidx.vectordrawable:vectordrawable:1.2.0' - implementation 'com.squareup.okhttp3:okhttp:5.3.2' - implementation 'io.reactivex.rxjava3:rxjava:3.1.12' - implementation 'io.reactivex.rxjava3:rxandroid:3.0.2' - implementation 'com.fasterxml.jackson.core:jackson-core:2.21.1' - implementation 'com.squareup.picasso:picasso:2.71828' - implementation 'com.github.woheller69:FreeDroidWarn:V1.10' + implementation libs.kotlin.stdlib + implementation libs.fragment.ktx + implementation libs.viewpager2 + implementation libs.vectordrawable + implementation libs.okhttp + implementation libs.rxjava + implementation libs.rxandroid + implementation libs.jackson.core + implementation libs.picasso + implementation libs.freedroidwarn } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..9ea8768 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,30 @@ +[versions] +fragment-ktx = "1.8.9" +freedroidwarn = "V1.10" +gradle = "9.1.0" +gradle-toolchains-foojay-resolver-convention = "1.0.0" +jackson-core = "2.21.2" +kotlin = "2.3.20" +okhttp = "5.3.2" +picasso = "2.71828" +rxandroid = "3.0.2" +rxjava = "3.1.12" +vectordrawable = "1.2.0" +viewpager2 = "1.1.0" + +[libraries] +fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment-ktx" } +freedroidwarn = { group = "com.github.woheller69", name = "FreeDroidWarn", version.ref = "freedroidwarn" } +gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "gradle" } +jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson-core" } +kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } +kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } +okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } +picasso = { group = "com.squareup.picasso", name = "picasso", version.ref = "picasso" } +rxandroid = { group = "io.reactivex.rxjava3", name = "rxandroid", version.ref = "rxandroid" } +rxjava = { group = "io.reactivex.rxjava3", name = "rxjava", version.ref = "rxjava" } +vectordrawable = { group = "androidx.vectordrawable", name = "vectordrawable", version.ref = "vectordrawable" } +viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref = "viewpager2" } + +[plugins] +foojay = { id = "org.gradle.toolchains.foojay-resolver-convention", version.ref = "gradle-toolchains-foojay-resolver-convention" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f50f69e..221c4f9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index c6d07c5..6cf5f51 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' + id "org.gradle.toolchains.foojay-resolver-convention" version "1.0.0" } rootProject.name = "michas-droid" include ':' diff --git a/src/main/kotlin/com/michatec/store/MainApplication.kt b/src/main/kotlin/com/michatec/store/MainApplication.kt index 584331e..988ab32 100644 --- a/src/main/kotlin/com/michatec/store/MainApplication.kt +++ b/src/main/kotlin/com/michatec/store/MainApplication.kt @@ -27,7 +27,7 @@ import com.michatec.store.utility.Utils import com.michatec.store.utility.extension.android.* import java.net.InetSocketAddress import java.net.Proxy -import org.woheller69.freeDroidWarn.FreeDroidWarn; +import org.woheller69.freeDroidWarn.FreeDroidWarn class MainApplication: Application() { private fun PackageInfo.toInstalledItem(): InstalledItem { @@ -43,7 +43,7 @@ class MainApplication: Application() { override fun onCreate() { super.onCreate() - FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE); + FreeDroidWarn.showWarningOnUpgrade(this, BuildConfig.VERSION_CODE) val databaseUpdated = Database.init(this) Preferences.init(this) diff --git a/src/main/kotlin/com/michatec/store/widget/FragmentLinearLayout.kt b/src/main/kotlin/com/michatec/store/widget/FragmentLinearLayout.kt index dc8d1a5..8bbec97 100644 --- a/src/main/kotlin/com/michatec/store/widget/FragmentLinearLayout.kt +++ b/src/main/kotlin/com/michatec/store/widget/FragmentLinearLayout.kt @@ -12,11 +12,4 @@ class FragmentLinearLayout: LinearLayout { init { fitsSystemWindows = true } - - @Suppress("unused") - var percentTranslationY: Float - get() = height.let { if (it > 0) translationY / it else 0f } - set(value) { - translationY = value * height - } }