Skip to content

Commit 3592aaa

Browse files
committed
Dependencies updates
1 parent 0172b28 commit 3592aaa

File tree

5 files changed

+38
-35
lines changed

5 files changed

+38
-35
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ plugins {
33
id 'org.jetbrains.kotlin.android'
44
id 'org.jetbrains.kotlin.plugin.serialization'
55
id 'com.google.devtools.ksp'
6+
id 'org.jetbrains.kotlin.plugin.compose'
67
}
78

9+
kotlin {
10+
jvmToolchain(17)
11+
}
812
android {
913
namespace 'com.phpbg.easysync'
1014
compileSdk 35
@@ -49,9 +53,6 @@ android {
4953
sourceCompatibility JavaVersion.VERSION_17
5054
targetCompatibility JavaVersion.VERSION_17
5155
}
52-
kotlinOptions {
53-
jvmTarget = '17'
54-
}
5556
buildFeatures {
5657
compose true
5758
buildConfig true
@@ -67,38 +68,38 @@ android {
6768
}
6869

6970
dependencies {
70-
implementation 'androidx.work:work-runtime-ktx:2.10.0'
71-
implementation 'androidx.room:room-runtime:2.6.1'
72-
annotationProcessor 'androidx.room:room-compiler:2.6.1'
73-
ksp 'androidx.room:room-compiler:2.6.1'
74-
implementation 'androidx.room:room-ktx:2.6.1'
75-
implementation 'androidx.core:core-ktx:1.15.0'
76-
implementation platform('org.jetbrains.kotlin:kotlin-bom:2.0.0')
77-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
78-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
79-
implementation 'androidx.activity:activity-compose:1.9.3'
80-
implementation 'androidx.activity:activity-ktx:1.9.3'
81-
implementation 'androidx.fragment:fragment-ktx:1.8.5'
82-
implementation platform('androidx.compose:compose-bom:2024.10.01')
83-
implementation 'androidx.compose.ui:ui:1.7.5'
84-
implementation 'androidx.compose.ui:ui-graphics:1.7.5'
85-
implementation 'androidx.compose.ui:ui-tooling-preview:1.7.5'
86-
implementation 'androidx.compose.material3:material3:1.3.1'
87-
implementation 'androidx.compose.material:material-icons-extended:1.7.5'
88-
implementation 'androidx.compose.runtime:runtime-livedata:1.7.5'
89-
implementation 'androidx.datastore:datastore-preferences:1.1.1'
90-
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
91-
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
92-
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
71+
implementation 'androidx.work:work-runtime-ktx:2.10.2'
72+
implementation 'androidx.room:room-runtime:2.7.2'
73+
annotationProcessor 'androidx.room:room-compiler:2.7.2'
74+
ksp 'androidx.room:room-compiler:2.7.2'
75+
implementation 'androidx.room:room-ktx:2.7.2'
76+
implementation 'androidx.core:core-ktx:1.16.0'
77+
implementation platform('org.jetbrains.kotlin:kotlin-bom:2.1.21')
78+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.2'
79+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.2'
80+
implementation 'androidx.activity:activity-compose:1.10.1'
81+
implementation 'androidx.activity:activity-ktx:1.10.1'
82+
implementation 'androidx.fragment:fragment-ktx:1.8.8'
83+
implementation platform('androidx.compose:compose-bom:2025.07.00')
84+
implementation 'androidx.compose.ui:ui:1.8.3'
85+
implementation 'androidx.compose.ui:ui-graphics:1.8.3'
86+
implementation 'androidx.compose.ui:ui-tooling-preview:1.8.3'
87+
implementation 'androidx.compose.material3:material3:1.3.2'
88+
implementation 'androidx.compose.material:material-icons-extended:1.7.8'
89+
implementation 'androidx.compose.runtime:runtime-livedata:1.8.3'
90+
implementation 'androidx.datastore:datastore-preferences:1.1.7'
91+
implementation 'com.squareup.okhttp3:okhttp:5.1.0'
92+
implementation 'com.squareup.okhttp3:logging-interceptor:5.1.0'
93+
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
9394
testImplementation 'junit:junit:4.13.2'
9495
testImplementation 'net.sf.kxml:kxml2:2.3.0'
9596
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
9697
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
97-
androidTestImplementation platform('androidx.compose:compose-bom:2024.10.01')
98+
androidTestImplementation platform('androidx.compose:compose-bom:2025.07.00')
9899
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
99100
debugImplementation 'androidx.compose.ui:ui-tooling'
100101
debugImplementation 'androidx.compose.ui:ui-test-manifest'
101102
implementation 'com.google.guava:guava:32.1.2-android'
102103
implementation 'ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0'
103-
implementation 'io.github.rburgst:okhttp-digest:3.1.0'
104+
implementation 'io.github.rburgst:okhttp-digest:3.1.1'
104105
}

app/src/main/java/com/phpbg/easysync/ui/DavSettingsActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private fun Preferences(
126126
label = { Text(text = "Url") },
127127
keyboardOptions = KeyboardOptions(
128128
capitalization = KeyboardCapitalization.None,
129-
autoCorrect = false,
129+
autoCorrectEnabled = false,
130130
keyboardType = KeyboardType.Uri
131131
)
132132
)
@@ -173,7 +173,7 @@ private fun Preferences(
173173
label = { Text(text = stringResource(R.string.dav_settings_remote_path)) },
174174
keyboardOptions = KeyboardOptions(
175175
capitalization = KeyboardCapitalization.None,
176-
autoCorrect = false,
176+
autoCorrectEnabled = false,
177177
keyboardType = KeyboardType.Uri
178178
)
179179
)

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
dependencies {
4-
classpath "org.jetbrains.kotlin:kotlin-serialization:1.9.10"
4+
classpath "org.jetbrains.kotlin:kotlin-serialization:2.2.0"
55
}
66
}
77
plugins {
88
id 'com.android.application' version '8.11.1' apply false
99
id 'com.android.library' version '8.11.1' apply false
10-
id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
11-
id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
10+
id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
11+
id 'com.google.devtools.ksp' version '2.2.0-2.0.2' apply false
12+
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.0' apply false
1213
}

0 commit comments

Comments
 (0)