Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 6601fdf

Browse files
authored
Gradle 7.4.2 and version catalog (#30)
1 parent 7e43a92 commit 6601fdf

File tree

7 files changed

+189
-142
lines changed

7 files changed

+189
-142
lines changed

build.gradle.kts

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
mavenLocal()
5-
}
6-
}
7-
1+
@Suppress("DSL_SCOPE_VIOLATION")
82
plugins {
93
java
10-
kotlin("jvm").version(Libs.KotlinVersion)
11-
id("java-library")
12-
id("maven-publish")
13-
id("java-gradle-plugin")
14-
id("com.gradle.plugin-publish").version(Libs.GradlePluginPublishVersion)
4+
`java-library`
5+
`maven-publish`
6+
`java-gradle-plugin`
7+
alias(libs.plugins.kotlin.jvm)
8+
alias(libs.plugins.gradle.plugin.publish)
159
}
1610

1711
repositories {
@@ -29,13 +23,13 @@ java {
2923

3024
dependencies {
3125
compileOnly(gradleApi())
32-
compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
33-
compileOnly("io.kotest:kotest-framework-api-jvm:4.4.3")
34-
implementation("io.kotest:kotest-framework-engine-jvm:4.4.3")
35-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
26+
compileOnly(libs.kotlin.gradle.plugin)
27+
compileOnly(libs.kotest.framework.api)
28+
implementation(libs.kotest.framework.engine)
29+
implementation(libs.kotlinx.coroutines.core)
3630

37-
testImplementation(Libs.Kotest.assertions)
38-
testImplementation(Libs.Kotest.junit5)
31+
testImplementation(libs.kotest.assertions.core)
32+
testImplementation(libs.kotest.runner.junit5)
3933
}
4034

4135
tasks.named<Test>("test") {

buildSrc/build.gradle.kts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import org.gradle.kotlin.dsl.`kotlin-dsl`
2-
3-
repositories {
4-
jcenter()
5-
}
6-
71
plugins {
82
`kotlin-dsl`
93
}
4+
5+
repositories {
6+
mavenCentral()
7+
}

buildSrc/src/main/kotlin/Libs.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

gradle/libs.versions.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[versions]
2+
kotlin = "1.4.32"
3+
kotest = "4.4.3"
4+
coroutines = "1.4.3"
5+
6+
[libraries]
7+
kotest-framework-api = { module = "io.kotest:kotest-framework-api", version.ref = "kotest" }
8+
kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
9+
kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
10+
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
11+
kotest-assertions-shared = { module = "io.kotest:kotest-assertions-shared", version.ref = "kotest" }
12+
13+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
14+
15+
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
16+
17+
[plugins]
18+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
19+
gradle-plugin-publish = { id = "com.gradle.plugin-publish", version = "0.15.0" }

gradle/wrapper/gradle-wrapper.jar

333 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)