diff --git a/.gitignore b/.gitignore index 669240a5..0f3d477d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build/ /captures .externalNativeBuild +.kotlin \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 488190df..2b4e99e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'org.jmailen.kotlinter' version '4.2.0' + id 'org.jmailen.kotlinter' version "4.3.0" } android { @@ -68,13 +68,14 @@ if (project.hasProperty('sign')) { dependencies { def coil_version = "2.6.0" def markwon_version = "4.6.2" + def tinylog_version = "2.7.0" implementation project(':client') - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.core:core-splashscreen:1.0.1' - implementation 'com.google.android.material:material:1.11.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.vectordrawable:vectordrawable:1.1.0' + implementation 'androidx.vectordrawable:vectordrawable:1.2.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'com.github.cyb3rko:QuickPermissions-Kotlin:1.1.3' @@ -86,8 +87,8 @@ dependencies { implementation "io.noties.markwon:ext-tables:$markwon_version" implementation "io.noties.markwon:ext-strikethrough:$markwon_version" - implementation 'org.tinylog:tinylog-api-kotlin:2.6.2' - implementation 'org.tinylog:tinylog-impl:2.6.2' + implementation "org.tinylog:tinylog-api-kotlin:$tinylog_version" + implementation "org.tinylog:tinylog-impl:$tinylog_version" } configurations { diff --git a/build.gradle b/build.gradle index 6225e2a3..99cf0f69 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.android.application' version '8.3.0' apply false - id 'org.jetbrains.kotlin.android' version '1.9.22' apply false + id 'com.android.application' version '8.5.0' apply false + id 'org.jetbrains.kotlin.android' version '2.0.0' apply false id 'org.hidetake.swagger.generator' version '2.14.0' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd491..e6441136 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4baf5a11..8a1f6b97 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..b740cf13 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/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/.