Skip to content

Commit 6775dad

Browse files
compose-devrel-github-botcompose-devrel-github-bot
committed
🤖 Update Dependencies
1 parent 2995c79 commit 6775dad

File tree

13 files changed

+546
-100
lines changed

13 files changed

+546
-100
lines changed

‎JetLagged/buildscripts/init.gradle.kts

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
val ktlintVersion = "0.46.1"
18+
19+
initscript {
20+
val spotlessVersion = "6.10.0"
21+
22+
repositories {
23+
mavenCentral()
24+
}
25+
26+
dependencies {
27+
classpath("com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion")
28+
}
29+
}
30+
31+
allprojects {
32+
if (this == rootProject) {
33+
return@allprojects
34+
}
35+
apply<com.diffplug.gradle.spotless.SpotlessPlugin>()
36+
extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
37+
kotlin {
38+
target("**/*.kt")
39+
targetExclude("**/build/**/*.kt")
40+
ktlint(ktlintVersion).editorConfigOverride(
41+
mapOf(
42+
"ktlint_code_style" to "android",
43+
"ij_kotlin_allow_trailing_comma" to true,
44+
// These rules were introduced in ktlint 0.46.0 and should not be
45+
// enabled without further discussion. They are disabled for now.
46+
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
47+
"disabled_rules" to
48+
"filename," +
49+
"annotation,annotation-spacing," +
50+
"argument-list-wrapping," +
51+
"double-colon-spacing," +
52+
"enum-entry-name-case," +
53+
"multiline-if-else," +
54+
"no-empty-first-line-in-method-block," +
55+
"package-name," +
56+
"trailing-comma," +
57+
"spacing-around-angle-brackets," +
58+
"spacing-between-declarations-with-annotations," +
59+
"spacing-between-declarations-with-comments," +
60+
"unary-op-spacing"
61+
)
62+
)
63+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
64+
}
65+
format("kts") {
66+
target("**/*.kts")
67+
targetExclude("**/build/**/*.kts")
68+
// Look for the first line that doesn't have a block comment (assumed to be the license)
69+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
70+
}
71+
}
72+
}

‎JetLagged/gradle/libs.versions.toml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
# Do not add a dependency to an individual sample, edit the global version instead.
44
#####
55
[versions]
6-
accompanist = "0.37.0"
7-
androidGradlePlugin = "8.8.1"
8-
androidx-activity-compose = "1.10.0"
6+
accompanist = "0.37.2"
7+
android-material3 = "1.13.0-alpha13"
8+
androidGradlePlugin = "8.9.2"
9+
androidx-activity-compose = "1.10.1"
910
androidx-appcompat = "1.7.0"
10-
androidx-compose-bom = "2025.02.00"
11+
androidx-compose-bom = "2025.04.01"
1112
androidx-constraintlayout = "1.1.0"
1213
androidx-core-splashscreen = "1.0.1"
13-
androidx-corektx = "1.15.0"
14+
androidx-corektx = "1.16.0"
1415
androidx-glance = "1.1.1"
1516
androidx-lifecycle = "2.8.2"
1617
androidx-lifecycle-compose = "2.8.7"
1718
androidx-lifecycle-runtime-compose = "2.8.7"
18-
androidx-navigation = "2.8.7"
19+
androidx-navigation = "2.8.9"
1920
androidx-palette = "1.0.0"
2021
androidx-test = "1.6.1"
2122
androidx-test-espresso = "3.6.1"
@@ -30,37 +31,38 @@ androix-test-uiautomator = "2.3.0"
3031
coil = "2.7.0"
3132
# @keep
3233
compileSdk = "35"
33-
coroutines = "1.10.1"
34+
coroutines = "1.10.2"
3435
google-maps = "18.2.0"
3536
gradle-versions = "0.52.0"
36-
hilt = "2.55"
37+
hilt = "2.56.2"
3738
hiltExt = "1.2.0"
38-
horologist = "0.6.22"
39+
horologist = "0.6.23"
3940
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
4041
jdkDesugar = "1.2.2"
4142
junit = "4.13.2"
42-
kotlin = "2.1.10"
43+
kotlin = "2.1.20"
4344
kotlinx-serialization-json = "1.7.3"
4445
kotlinx_immutable = "0.3.8"
45-
ksp = "2.1.10-1.0.30"
46+
ksp = "2.1.20-2.0.0"
4647
maps-compose = "3.1.1"
4748
# @keep
4849
minSdk = "21"
4950
okhttp = "4.12.0"
5051
play-services-wearable = "18.1.0"
5152
robolectric = "4.14.1"
52-
roborazzi = "1.42.0"
53+
roborazzi = "1.43.1"
5354
rome = "2.1.0"
54-
room = "2.6.1"
55+
room = "2.7.1"
5556
secrets = "2.0.1"
5657
spotless = "7.0.3"
5758
# @keep
5859
targetSdk = "33"
59-
version-catalog-update = "0.8.5"
60+
version-catalog-update = "1.0.0"
6061

6162
[libraries]
6263
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
6364
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
65+
android-material3 = { module = "com.google.android.material:material", version.ref = "android-material3" }
6466
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
6567
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" }
6668
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }

‎JetNews/buildscripts/init.gradle.kts

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
val ktlintVersion = "0.46.1"
18+
19+
initscript {
20+
val spotlessVersion = "6.10.0"
21+
22+
repositories {
23+
mavenCentral()
24+
}
25+
26+
dependencies {
27+
classpath("com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion")
28+
}
29+
}
30+
31+
allprojects {
32+
if (this == rootProject) {
33+
return@allprojects
34+
}
35+
apply<com.diffplug.gradle.spotless.SpotlessPlugin>()
36+
extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
37+
kotlin {
38+
target("**/*.kt")
39+
targetExclude("**/build/**/*.kt")
40+
ktlint(ktlintVersion).editorConfigOverride(
41+
mapOf(
42+
"ktlint_code_style" to "android",
43+
"ij_kotlin_allow_trailing_comma" to true,
44+
// These rules were introduced in ktlint 0.46.0 and should not be
45+
// enabled without further discussion. They are disabled for now.
46+
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
47+
"disabled_rules" to
48+
"filename," +
49+
"annotation,annotation-spacing," +
50+
"argument-list-wrapping," +
51+
"double-colon-spacing," +
52+
"enum-entry-name-case," +
53+
"multiline-if-else," +
54+
"no-empty-first-line-in-method-block," +
55+
"package-name," +
56+
"trailing-comma," +
57+
"spacing-around-angle-brackets," +
58+
"spacing-between-declarations-with-annotations," +
59+
"spacing-between-declarations-with-comments," +
60+
"unary-op-spacing"
61+
)
62+
)
63+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
64+
}
65+
format("kts") {
66+
target("**/*.kts")
67+
targetExclude("**/build/**/*.kts")
68+
// Look for the first line that doesn't have a block comment (assumed to be the license)
69+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
70+
}
71+
}
72+
}

‎JetNews/gradle/libs.versions.toml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
# Do not add a dependency to an individual sample, edit the global version instead.
44
#####
55
[versions]
6-
accompanist = "0.37.0"
7-
androidGradlePlugin = "8.8.1"
8-
androidx-activity-compose = "1.10.0"
6+
accompanist = "0.37.2"
7+
android-material3 = "1.13.0-alpha13"
8+
androidGradlePlugin = "8.9.2"
9+
androidx-activity-compose = "1.10.1"
910
androidx-appcompat = "1.7.0"
10-
androidx-compose-bom = "2025.02.00"
11+
androidx-compose-bom = "2025.04.01"
1112
androidx-constraintlayout = "1.1.0"
1213
androidx-core-splashscreen = "1.0.1"
13-
androidx-corektx = "1.15.0"
14+
androidx-corektx = "1.16.0"
1415
androidx-glance = "1.1.1"
1516
androidx-lifecycle = "2.8.2"
1617
androidx-lifecycle-compose = "2.8.7"
1718
androidx-lifecycle-runtime-compose = "2.8.7"
18-
androidx-navigation = "2.8.7"
19+
androidx-navigation = "2.8.9"
1920
androidx-palette = "1.0.0"
2021
androidx-test = "1.6.1"
2122
androidx-test-espresso = "3.6.1"
@@ -30,37 +31,38 @@ androix-test-uiautomator = "2.3.0"
3031
coil = "2.7.0"
3132
# @keep
3233
compileSdk = "35"
33-
coroutines = "1.10.1"
34+
coroutines = "1.10.2"
3435
google-maps = "18.2.0"
3536
gradle-versions = "0.52.0"
36-
hilt = "2.55"
37+
hilt = "2.56.2"
3738
hiltExt = "1.2.0"
38-
horologist = "0.6.22"
39+
horologist = "0.6.23"
3940
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
4041
jdkDesugar = "1.2.2"
4142
junit = "4.13.2"
42-
kotlin = "2.1.10"
43+
kotlin = "2.1.20"
4344
kotlinx-serialization-json = "1.7.3"
4445
kotlinx_immutable = "0.3.8"
45-
ksp = "2.1.10-1.0.30"
46+
ksp = "2.1.20-2.0.0"
4647
maps-compose = "3.1.1"
4748
# @keep
4849
minSdk = "21"
4950
okhttp = "4.12.0"
5051
play-services-wearable = "18.1.0"
5152
robolectric = "4.14.1"
52-
roborazzi = "1.42.0"
53+
roborazzi = "1.43.1"
5354
rome = "2.1.0"
54-
room = "2.6.1"
55+
room = "2.7.1"
5556
secrets = "2.0.1"
5657
spotless = "7.0.3"
5758
# @keep
5859
targetSdk = "33"
59-
version-catalog-update = "0.8.5"
60+
version-catalog-update = "1.0.0"
6061

6162
[libraries]
6263
accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
6364
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
65+
android-material3 = { module = "com.google.android.material:material", version.ref = "android-material3" }
6466
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
6567
androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" }
6668
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }

‎Jetcaster/buildscripts/init.gradle.kts

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
val ktlintVersion = "0.46.1"
18+
19+
initscript {
20+
val spotlessVersion = "6.10.0"
21+
22+
repositories {
23+
mavenCentral()
24+
}
25+
26+
dependencies {
27+
classpath("com.diffplug.spotless:spotless-plugin-gradle:$spotlessVersion")
28+
}
29+
}
30+
31+
allprojects {
32+
if (this == rootProject) {
33+
return@allprojects
34+
}
35+
apply<com.diffplug.gradle.spotless.SpotlessPlugin>()
36+
extensions.configure<com.diffplug.gradle.spotless.SpotlessExtension> {
37+
kotlin {
38+
target("**/*.kt")
39+
targetExclude("**/build/**/*.kt")
40+
ktlint(ktlintVersion).editorConfigOverride(
41+
mapOf(
42+
"ktlint_code_style" to "android",
43+
"ij_kotlin_allow_trailing_comma" to true,
44+
// These rules were introduced in ktlint 0.46.0 and should not be
45+
// enabled without further discussion. They are disabled for now.
46+
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
47+
"disabled_rules" to
48+
"filename," +
49+
"annotation,annotation-spacing," +
50+
"argument-list-wrapping," +
51+
"double-colon-spacing," +
52+
"enum-entry-name-case," +
53+
"multiline-if-else," +
54+
"no-empty-first-line-in-method-block," +
55+
"package-name," +
56+
"trailing-comma," +
57+
"spacing-around-angle-brackets," +
58+
"spacing-between-declarations-with-annotations," +
59+
"spacing-between-declarations-with-comments," +
60+
"unary-op-spacing"
61+
)
62+
)
63+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
64+
}
65+
format("kts") {
66+
target("**/*.kts")
67+
targetExclude("**/build/**/*.kts")
68+
// Look for the first line that doesn't have a block comment (assumed to be the license)
69+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
70+
}
71+
}
72+
}

0 commit comments

Comments
 (0)