mirror of
https://github.com/Michatec/michas-droid.git
synced 2026-05-30 18:02:43 +02:00
- 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`
This commit is contained in:
@@ -12,3 +12,4 @@
|
||||
!/proguard.pro
|
||||
!/README.md
|
||||
!/src
|
||||
/gradle/gradle-daemon-jvm.properties
|
||||
|
||||
+14
-14
@@ -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
|
||||
}
|
||||
|
||||
@@ -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" }
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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 ':'
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user