Skip to content

Commit

Permalink
Merge pull request #819 from splendo/feature/781-kotlin-20.0.21
Browse files Browse the repository at this point in the history
Kotlin 20.0.21 and other upgrades, published version catalog
  • Loading branch information
thoutbeckers authored Oct 14, 2024
2 parents 91dcc70 + cb86cbd commit 9652b1a
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 15 deletions.
18 changes: 18 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
plugins {
id("com.splendo.kaluga.plugin")
id("rs.houtbecke.gradle.recorder.plugin")
`version-catalog`
`maven-publish`
}

apply(from = "gradle/newModule.gradle.kts")
apply(from = "gradle/copyReports.gradle.kts")

catalog {
versionCatalog {
library("catalog", "com.splendo.kaluga:catalog:"+libs.versions.kaluga.get())
from(files("gradle/libs.versions.toml"))
}
}

publishing {
publications {
create<MavenPublication>("catalog") {
from(components["versionCatalog"])
artifactId = "catalog"
}
}
}
26 changes: 13 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
# kotlin version is included since it will affect building
androidGradle = "8.5.2"
androidGradle = "8.7.0"
androidBuildTools = "34.0.0"
androidCompileSdk = "34"
androidCompileSdk = "35"
androidMinSdk = "24"
kotlin = "2.0.20"
kotlin = "2.0.21"
kotlinter = "4.4.1"
kotlinx-kover = "0.8.3"
dependencycheck = "10.0.3"
Expand All @@ -16,32 +16,32 @@ kaluga = "1.5.0"
kotlinx-atomicfu = "0.25.0"
kotlinx-coroutines = "1.9.0"
kotlinx-serialization = "1.7.3"
accompanist = "0.34.0"
accompanist = "0.36.0"
android-material = "1.12.0"
android-play-review = "2.0.1"
android-play-services-location = "21.3.0"
androidx-activity = "1.9.1"
androidx-activity = "1.9.2"
androidx-appcompat = "1.7.0"
androidx-arch-core = "2.2.0"
androidx-browser = "1.8.0"
androidx-compose = "1.6.8"
androidx-compose-ui = "1.6.8"
androidx-compose-material = "1.2.1"
androidx-compose = "1.7.3"
androidx-compose-ui = "1.7.3"
androidx-compose-material = "1.3.0"
androidx-constraintlayout = "2.1.4"
androidx-core = "1.13.1"
androidx-fragment = "1.8.2"
androidx-lifecycle = "2.8.4"
androidx-navigation = "2.7.7"
androidx-fragment = "1.8.4"
androidx-lifecycle = "2.8.6"
androidx-navigation = "2.8.2"
androidx-test = "1.6.1"
androidx-test-runner = "1.6.2"
androidx-test-espresso = "3.6.1"
androidx-test-junit = "1.2.1"
androidx-test-uiautomator = "2.3.0"
bytebuddy = "1.15.0"
bytebuddy = "1.15.3"
junit = "4.13.2"
koin = "3.5.6"
koin-compose = "3.5.6"
mockito = "5.11.0"
mockito = "5.14.1"
napier = "2.7.1"
nordic-support = "1.6.0"

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Oct 10 09:58:47 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ sealed class BaseKalugaExtension(protected val versionCatalog: VersionCatalog, o
developers {
developer {
id.set("splendo")
name.set("Splendo BV")
name.set("Splendo Consulting BV")
}
}
scm {
Expand Down

0 comments on commit 9652b1a

Please sign in to comment.