Skip to content

Commit e3ffa3e

Browse files
committed
Technical: Update dependencies.
1 parent e75ee7e commit e3ffa3e

File tree

8 files changed

+40
-30
lines changed

8 files changed

+40
-30
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ ktlint_standard_blank-line-between-when-conditions=disabled
1313
ktlint_standard_backing-property-naming=disabled
1414
ktlint_standard_kdoc=disabled
1515
ktlint_standard_condition-wrapping=disabled
16+
ktlint_standard_expression-operand-wrapping=disabled
17+
ktlint_standard_function-signature=disabled
18+
ktlint_standard_spacing-between-declarations-with-comments=disabled
19+
ktlint_standard_mixed-condition-operators=disabled
1620
ktlint_experimental=enabled

build.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
buildscript {
24
dependencies {
35
classpath(libs.plugin.android.cache.fix)
@@ -55,4 +57,13 @@ subprojects {
5557
tasks.withType(Test::class.java).all {
5658
testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
5759
}
60+
61+
tasks.withType<KotlinCompile>().configureEach {
62+
compilerOptions {
63+
freeCompilerArgs.addAll(
64+
"-Xconsistent-data-class-copy-visibility",
65+
"-Xannotation-default-target=param-property",
66+
)
67+
}
68+
}
5869
}

cropper/src/main/kotlin/com/canhub/cropper/CropImageIntentChooser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ internal class CropImageIntentChooser(
185185
* It is required in Android Marshmallow and above if "CAMERA" permission is requested in the
186186
* manifest.<br></br>
187187
* See [StackOverflow
188-
* question](http://stackoverflow.com/questions/32789027/android-m-camera-intent-permission-bug).
188+
* question](http://stackoverflow.com/questions/32789027/android-m-camera-intent-permission-bug).
189189
*/
190190
private fun isExplicitCameraPermissionRequired(context: Context): Boolean = SDK_INT >= Build.VERSION_CODES.M &&
191191
hasCameraPermissionInManifest(context) &&

gradle/libs.versions.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@ minSdk = "21"
33
compileSdk = "34"
44
targetSdk = "34"
55

6-
androidgradleplugin = "8.5.2"
7-
kotlin = "2.0.0"
8-
kotlinxcoroutines = "1.8.1"
9-
ktlint = "1.3.1"
6+
androidgradleplugin = "8.13.1"
7+
kotlin = "2.2.21"
8+
kotlinxcoroutines = "1.10.2"
9+
ktlint = "1.8.0"
1010

1111
[libraries]
12-
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version = "1.9.2" }
13-
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
14-
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.13.1" }
15-
androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version = "1.3.7" }
16-
androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", version = "1.8.4" }
17-
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
12+
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version = "1.9.3" }
13+
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
14+
androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.13.0" }
15+
androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version = "1.4.1" }
16+
androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", version = "1.8.9" }
17+
androidx-test-junit = { module = "androidx.test.ext:junit", version = "1.3.0" }
1818
junit = { module = "junit:junit", version = "4.13.2" }
1919
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxcoroutines" }
2020
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxcoroutines" }
2121
leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version = "2.14" }
22-
material = { module = "com.google.android.material:material", version = "1.12.0" }
23-
mock = { module = "io.mockk:mockk", version = "1.13.12" }
24-
plugin-android-cache-fix = { module = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin", version = "3.0.1" }
22+
material = { module = "com.google.android.material:material", version = "1.13.0" }
23+
mock = { module = "io.mockk:mockk", version = "1.17.0" }
24+
plugin-android-cache-fix = { module = "org.gradle.android.cache-fix:org.gradle.android.cache-fix.gradle.plugin", version = "3.0.3" }
2525
plugin-androidgradleplugin = { module = "com.android.tools.build:gradle", version.ref = "androidgradleplugin" }
2626
plugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" }
2727
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
28-
plugin-licensee = { module = "app.cash.licensee:licensee-gradle-plugin", version = "1.11.0" }
29-
plugin-paparazzi = { module = "app.cash.paparazzi:paparazzi-gradle-plugin", version = "1.3.3" }
30-
plugin-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.29.0" }
31-
robolectric = { module = "org.robolectric:robolectric", version = "4.12.1" }
28+
plugin-licensee = { module = "app.cash.licensee:licensee-gradle-plugin", version = "1.14.1" }
29+
plugin-paparazzi = { module = "app.cash.paparazzi:paparazzi-gradle-plugin", version = "1.3.5" }
30+
plugin-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.35.0" }
31+
robolectric = { module = "org.robolectric:robolectric", version = "4.16" }
3232
timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
3333

3434
[plugins]

gradle/wrapper/gradle-wrapper.jar

2.08 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7-
7+
zipStorePath=wrapper/dists

gradlew

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
119117

120118

121119
# Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
173171
# For Cygwin or MSYS, switch paths to Windows format before running java
174172
if "$cygwin" || "$msys" ; then
175173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
176-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
177174

178175
JAVACMD=$( cygpath --unix "$JAVACMD" )
179176

@@ -206,15 +203,14 @@ fi
206203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207204

208205
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210207
# and any embedded shellness will be escaped.
211208
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212209
# treated as '${Hostname}' itself on the command line.
213210

214211
set -- \
215212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216-
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
213+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218214
"$@"
219215

220216
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)