Skip to content

Commit 4f3afa1

Browse files
authored
chore: Update dependencies (Compose BOM 2023.03.00) (#38)
1 parent a7a9008 commit 4f3afa1

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ indent_style = tab
1111
indent_size = 4
1212
# ktlint configuration
1313
ktlint_code_style = android
14-
#ktlint_disabled_rules =
14+
ktlint_experimental = enabled
15+
ktlint_experimental_function-naming = disabled
16+
ktlint_experimental_property-naming = disabled
1517
ij_kotlin_allow_trailing_comma = true
1618
ij_kotlin_allow_trailing_comma_on_call_site = true
1719

build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ version = Publication.version
1414

1515
subprojects {
1616
apply(plugin = "org.jmailen.kotlinter")
17-
18-
kotlinter {
19-
experimentalRules = true
20-
}
2117
}
2218

2319
nexusPublishing {
@@ -30,7 +26,7 @@ tasks.withType<DependencyUpdatesTask> {
3026

3127
fun isNonStable(version: String) =
3228
listOf("alpha", "beta", "rc", "eap", "-m", ".m", "-a", "dev").any {
33-
version.toLowerCase().contains(it)
29+
version.lowercase().contains(it)
3430
}
3531

3632
rejectVersionIf {

buildSrc/src/main/kotlin/Publication.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ object Publication {
55
val version = (System.getenv("RELEASE_TAG_NAME") ?: "SNAPSHOT").let { it.replace("v", "") }
66
}
77

8-
fun MavenPublication.pomAttributes() {
8+
fun MavenPublication.pomAttributes(name: String) {
99
pom {
10-
name.set("Reveal")
10+
this.name.set(name)
1111
description.set("Lightweight, simple reveal effect for Jetpack Compose")
1212
url.set("https://github.com/svenjacobs/reveal")
1313

1414
developers {
1515
developer {
1616
id.set("svenjacobs")
17-
name.set("Sven Jacobs")
17+
this.name.set("Sven Jacobs")
1818
email.set("[email protected]")
1919
url.set("https://svenjacobs.com/")
2020
timezone.set("GMT+1")
@@ -23,7 +23,7 @@ fun MavenPublication.pomAttributes() {
2323

2424
licenses {
2525
license {
26-
name.set("MIT License")
26+
this.name.set("MIT License")
2727
url.set("https://opensource.org/licenses/MIT")
2828
}
2929
}

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
22
android-gradle-plugin = "7.4.2"
3-
androidx-activity = "1.6.1"
4-
androidx-compose-bom = "2023.01.00" # https://developer.android.com/jetpack/compose/setup#bom-version-mapping
5-
androidx-compose-compiler = "1.4.3"
6-
androidx-lifecycle = "2.6.0-rc01"
3+
androidx-activity = "1.7.0"
4+
androidx-compose-bom = "2023.03.00" # https://developer.android.com/jetpack/compose/setup#bom-version-mapping
5+
androidx-compose-compiler = "1.4.4"
6+
androidx-lifecycle = "2.6.1"
77
kotlin = "1.8.10"
88

99
[libraries]
@@ -35,4 +35,4 @@ android-library = { id = "com.android.library", version.ref = "android-gradle-pl
3535
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3636
ben-manes-versions = "com.github.ben-manes.versions:0.46.0"
3737
nexus-publish = "io.github.gradle-nexus.publish-plugin:1.3.0"
38-
kotlinter = "org.jmailen.kotlinter:3.13.0"
38+
kotlinter = "org.jmailen.kotlinter:3.14.0"

reveal-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ publishing {
8989
from(components["release"])
9090
}
9191

92-
pomAttributes()
92+
pomAttributes(name = "Reveal (Core)")
9393
}
9494
}
9595
}

reveal-shapes/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ publishing {
8787
from(components["release"])
8888
}
8989

90-
pomAttributes()
90+
pomAttributes(name = "Reveal (Shapes)")
9191
}
9292
}
9393
}

0 commit comments

Comments
 (0)