Skip to content

Commit bb9319e

Browse files
sureshgsureshg
committed
chore: dependency updates
1 parent 8a6e003 commit bb9319e

File tree

8 files changed

+244
-46
lines changed

8 files changed

+244
-46
lines changed

‎.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ jobs:
7777
distribution: jdkfile
7878
java-version: ${{ steps.download-jdk.outputs.version }}
7979
jdkFile: ${{ steps.download-jdk.outputs.archive }}
80-
cache: 'gradle'
80+
81+
- name: Setup Gradle
82+
uses: gradle/gradle-build-action@v2
83+
with:
84+
gradle-version: wrapper
8185

8286
- name: 🏗️ Gradle Build & Run
8387
id: gradle-build

‎gradle/build-logic/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ $ ./gradlew checkBuildLogicBestPractices
88
$ ./gradlew -p gradle/build-logic checkBestPractices
99
```
1010

11-
#### Submit Dependency Graph to [Github Dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates)
11+
#### Submit Dependency Graph to [Github Dependabot](https://github.com/gradle/github-dependency-graph-gradle-plugin)
1212

1313
```bash
14-
$ export GITHUB_JOB="Build"
15-
export GITHUB_RUN_NUMBER="42"
14+
$ export GITHUB_DEPENDENCY_GRAPH_JOB_ID="42"
15+
export GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR="dep-graph"
1616
export GITHUB_REF="refs/heads/main"
1717
export GITHUB_SHA=$(git rev-parse HEAD)
1818
export GITHUB_WORKSPACE=$(pwd)
@@ -26,7 +26,7 @@ $ curl -L \
2626
-H "Authorization: Bearer $GITHUB_TOKEN"\
2727
-H "X-GitHub-Api-Version: 2022-11-28" \
2828
https://api.github.com/repos/gradle/github-dependency-graph-gradle-plugin/dependency-graph/snapshots \
29-
-d @build/reports/github-dependency-graph-plugin/github-dependency-snapshot.json
29+
-d @build/reports/github-dependency-graph-snapshots/${GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR}.json
3030
```
3131

3232
* [Gradle Best Practices](https://github.com/liutikas/gradle-best-practices)

‎gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.jvm.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ dependencies {
7777
testImplementation(platform(libs.junit.bom))
7878
testImplementation(kotlin("test-junit5"))
7979
testImplementation(libs.junit.jupiter)
80+
testImplementation(libs.kotlinx.lincheck)
8081
testImplementation(libs.kotlinx.coroutines.test)
8182
testImplementation(libs.slf4j.simple)
8283
}

‎gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.mpp.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,12 @@ kotlinMultiplatform.apply {
106106
implementation(libs.kotlinx.datetime)
107107
implementation(libs.kotlinx.serialization.json)
108108
implementation(libs.kotlinx.io.bytestring)
109+
implementation(libs.kotlinx.collections.immutable)
109110
implementation(libs.kotlinx.io.core)
110111
implementation(libs.ktor.client.core)
111112
implementation(libs.ktor.client.logging)
112113
implementation(libs.ktor.client.serialization)
114+
implementation(libs.intellij.markdown)
113115
}
114116
}
115117

@@ -126,6 +128,7 @@ kotlinMultiplatform.apply {
126128
// https://kotlinlang.org/docs/ksp-multiplatform.html
127129
project.dependencies.add("kspJvm", libs.ksp.auto.service)
128130
implementation(libs.google.auto.annotations)
131+
implementation(libs.slf4j.api)
129132
}
130133
}
131134

@@ -204,7 +207,7 @@ tasks {
204207
}
205208
}
206209

207-
artifacts { add("commonJsResources", tasks.named("jsProcessResources")) }
210+
artifacts { add(commonJsResources.name, tasks.named("jsProcessResources")) }
208211

209212
dependencies {
210213
// add("kspJvm", project(":ksp-processor"))

‎gradle/build-logic/common-plugins/src/main/kotlin/settings/repos.settings.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ gradleEnterprise {
6666
buildScan {
6767
termsOfServiceUrl = "https://gradle.com/terms-of-service"
6868
termsOfServiceAgree = "yes"
69-
capture.isTaskInputFiles = true
69+
70+
capture { isTaskInputFiles = true }
71+
72+
obfuscation { ipAddresses { addresses -> addresses.map { _ -> "0.0.0.0" } } }
73+
7074
if (GithubAction.isEnabled) {
7175
publishAlways()
7276
isUploadInBackground = false

‎gradle/libs.versions.toml

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,23 @@ publish-scm-url = "https://github.com/sureshg/kotlin-mpp-playgrou
2323
# Gradle Dependencies Versions
2424
kotlinx-kover = "0.7.2"
2525
kotlinx-io = "0.2.0"
26+
kotlinx-atomicfu = "0.21.0"
27+
kotlinx-coroutines = "1.7.2"
28+
kotlinx-datetime = "0.4.0"
29+
kotlinx-serialization = "1.5.1"
30+
kotlinx-collections-immutable = "0.3.5"
31+
kotlinx-lincheck = "2.20"
32+
kotlinx-benchmark = "0.4.8"
33+
kotlinx-reflect-lite = "1.0.0"
2634
zip-prefixer = "0.3.1"
27-
ajalt-mordant = "2.0.0-beta14"
35+
ajalt-mordant = "2.0.0"
36+
ajalt-clikt = "4.0.0"
2837
classgraph = "4.8.160"
2938
dokka = "1.8.20"
39+
intellij-markdown = "0.4.1"
3040
jgit = "6.5.0.202303070854-r"
3141
jte = "3.0.0"
3242
junit = "5.10.0-M1"
33-
kotlinx-atomicfu = "0.21.0"
34-
kotlinx-coroutines = "1.7.2"
35-
kotlinx-datetime = "0.4.0"
36-
kotlinx-serialization = "1.5.1"
3743
ktor = "2.3.2"
3844
kotlinRetry = "1.0.9"
3945
koin = "3.4.1"
@@ -61,7 +67,7 @@ taskinfo = "2.1.0"
6167
dependency-analysis = "1.20.0"
6268
best-practices-plugin = "0.9"
6369
graalvm-nativeimage = "0.9.23"
64-
github-depgraph = "0.0.2"
70+
github-depgraph = "0.0.3"
6571

6672

6773
[libraries]
@@ -90,23 +96,29 @@ build-nativeimage-plugin = { module = "org.graalvm.buildtools:native-grad
9096
build-github-depgraph = { module = "org.gradle:github-dependency-graph-gradle-plugin" , version.ref = "github-depgraph"}
9197

9298
# Gradle Dependencies
93-
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom" , version.ref = "kotlin"}
94-
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" , version.ref = "kotlin"}
95-
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" , version.ref = "kotlin"}
96-
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" , version.ref = "kotlin"}
97-
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" , version.ref = "kotlin"}
98-
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core" , version.ref = "kotlinx-coroutines"}
99-
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test" , version.ref = "kotlinx-coroutines"}
100-
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core" , version.ref = "kotlinx-serialization"}
101-
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json" , version.ref = "kotlinx-serialization"}
102-
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime" , version.ref = "kotlinx-datetime"}
103-
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu" , version.ref = "kotlinx-atomicfu"}
104-
kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core" , version.ref = "kotlinx-io"}
105-
kotlinx-io-bytestring = { module = "org.jetbrains.kotlinx:kotlinx-io-bytestring" , version.ref = "kotlinx-io"}
99+
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom" , version.ref = "kotlin"}
100+
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" , version.ref = "kotlin"}
101+
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8" , version.ref = "kotlin"}
102+
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" , version.ref = "kotlin"}
103+
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" , version.ref = "kotlin"}
104+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core" , version.ref = "kotlinx-coroutines"}
105+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test" , version.ref = "kotlinx-coroutines"}
106+
kotlinx-coroutines-slf4j = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j" , version.ref = "kotlinx-coroutines"}
107+
kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug" , version.ref = "kotlinx-coroutines"}
108+
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core" , version.ref = "kotlinx-serialization"}
109+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json" , version.ref = "kotlinx-serialization"}
110+
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime" , version.ref = "kotlinx-datetime"}
111+
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu" , version.ref = "kotlinx-atomicfu"}
112+
kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core" , version.ref = "kotlinx-io"}
113+
kotlinx-io-bytestring = { module = "org.jetbrains.kotlinx:kotlinx-io-bytestring" , version.ref = "kotlinx-io"}
114+
kotlinx-lincheck = { module = "org.jetbrains.kotlinx:lincheck" , version.ref = "kotlinx-lincheck"}
115+
kotlinx-reflect-lite = { module = "org.jetbrains.kotlinx:kotlinx.reflect.lite" , version.ref = "kotlinx-reflect-lite"}
116+
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable" , version.ref = "kotlinx-collections-immutable"}
106117

107-
kotlinRetry = { module = "com.michael-bull.kotlin-retry:kotlin-retry" , version.ref = "kotlinRetry" }
108-
kotest-core = { module = "io.kotest:kotest-assertions-core" , version.ref = "kotest"}
109-
kotest-junit5 = { module = "io.kotest:kotest-runner-junit5" , version.ref = "kotest"}
118+
kotlinRetry = { module = "com.michael-bull.kotlin-retry:kotlin-retry" , version.ref = "kotlinRetry" }
119+
kotest-core = { module = "io.kotest:kotest-assertions-core" , version.ref = "kotest"}
120+
kotest-junit5 = { module = "io.kotest:kotest-runner-junit5" , version.ref = "kotest"}
121+
intellij-markdown = { module = "org.jetbrains:markdown" , version.ref = "intellij-markdown"}
110122

111123
ktor-bom = { module = "io.ktor:ktor-bom" , version.ref = "ktor"}
112124
ktor-server = { module = "io.ktor:ktor-server-core" , version.ref = "ktor"}
@@ -129,18 +141,18 @@ ktor-client-logging = { module = "io.ktor:ktor-client-logging"
129141
rsocket-ktor-client = { module = "io.rsocket.kotlin:rsocket-ktor-client" , version.ref = "rsocket"}
130142
rsocket-ktor-server = { module = "io.rsocket.kotlin:rsocket-ktor-server" , version.ref = "rsocket"}
131143

132-
ajalt-mordant = { module = "com.github.ajalt.mordant:mordant" , version.ref = "ajalt-mordant"}
133-
jgit = { module = "org.eclipse.jgit:org.eclipse.jgit" , version.ref = "jgit" }
134-
jte = { module = "gg.jte:jte" , version.ref = "jte" }
135-
jte-runtime = { module = "gg.jte:jte-runtime" , version.ref = "jte" }
136-
jte-models = { module = "gg.jte:jte-models" , version.ref = "jte" }
137-
jte-native = { module = "gg.jte:native-resources" , version.ref = "jte" }
138-
jte-kotlin = { module = "gg.jte:jte-kotlin" , version.ref = "jte" }
139-
junit-bom = { module = "org.junit:junit-bom" , version.ref = "junit"}
140-
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" , version.ref = "junit"}
141-
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" , version.ref = "junit"}
142-
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" , version.ref = "junit"}
143-
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" , version.ref = "junit"}
144+
ajalt-mordant = { module = "com.github.ajalt.mordant:mordant" , version.ref = "ajalt-mordant"}
145+
jgit = { module = "org.eclipse.jgit:org.eclipse.jgit" , version.ref = "jgit" }
146+
jte = { module = "gg.jte:jte" , version.ref = "jte" }
147+
jte-runtime = { module = "gg.jte:jte-runtime" , version.ref = "jte" }
148+
jte-models = { module = "gg.jte:jte-models" , version.ref = "jte" }
149+
jte-native = { module = "gg.jte:native-resources" , version.ref = "jte" }
150+
jte-kotlin = { module = "gg.jte:jte-kotlin" , version.ref = "jte" }
151+
junit-bom = { module = "org.junit:junit-bom" , version.ref = "junit"}
152+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" , version.ref = "junit"}
153+
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" , version.ref = "junit"}
154+
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" , version.ref = "junit"}
155+
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" , version.ref = "junit"}
144156

145157
graalvm-sdk = { module = "org.graalvm.sdk:graal-sdk" , version.ref = "graalvm"}
146158
google-auto-annotations = { module = "com.google.auto.service:auto-service-annotations" , version.ref = "google-auto-service"}
@@ -152,10 +164,10 @@ koin-slf4j = { module = "io.insert-koin:koin-logger-slf4j"
152164
koin-test = { module = "io.insert-koin:koin-test" , version.ref = "koin"}
153165
koin-test-junit5 = { module = "io.insert-koin:koin-test-junit5" , version.ref = "koin"}
154166

155-
classgraph = { module = "io.github.classgraph:classgraph" , version.ref = "classgraph"}
156-
slf4j-api = { module = "org.slf4j:slf4j-api" , version.ref = "slf4j"}
157-
slf4j-simple = { module = "org.slf4j:slf4j-simple" , version.ref = "slf4j"}
158-
slf4j-nop = { module = "org.slf4j:slf4j-nop" , version.ref = "slf4j"}
167+
classgraph = { module = "io.github.classgraph:classgraph" , version.ref = "classgraph"}
168+
slf4j-api = { module = "org.slf4j:slf4j-api" , version.ref = "slf4j"}
169+
slf4j-simple = { module = "org.slf4j:slf4j-simple" , version.ref = "slf4j"}
170+
slf4j-nop = { module = "org.slf4j:slf4j-nop" , version.ref = "slf4j"}
159171

160172
[plugins]
161173
benmanes = { id = "com.github.ben-manes.versions" , version.ref = "benmanes" }

0 commit comments

Comments
 (0)