Skip to content

Commit 68f9102

Browse files
authored
fix api deps versions (#8)
* - add versions to 'api' dependencies - remove 'enforcedPlatform' - add `java-library` plugin - bump gradle version * try adding a versioning plugin... * make gradle wrapper update
1 parent d99fd66 commit 68f9102

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

build.gradle.kts

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
val kotlinVersion = "1.6.10"
5-
kotlin("jvm") version kotlinVersion
4+
kotlin("jvm") version "1.6.10"
65
jacoco
76
`java-library`
7+
id("me.qoomon.git-versioning") version "5.1.1"
88
`maven-publish`
99
}
1010

@@ -13,8 +13,8 @@ dependencies {
1313

1414
val kotlinxSerializationVersion = "1.3.1"
1515
implementation(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:$kotlinxSerializationVersion"))
16-
api("org.jetbrains.kotlinx:kotlinx-serialization-core")
17-
api("org.jetbrains.kotlinx:kotlinx-serialization-json")
16+
api("org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlinxSerializationVersion")
17+
api("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationVersion")
1818

1919
val junitVersion = "5.8.2"
2020
testImplementation(platform("org.junit:junit-bom:$junitVersion"))
@@ -32,8 +32,17 @@ dependencies {
3232
}
3333

3434
group = "at.syntaxerror"
35-
version = "2.0.2"
3635
description = "JSON5 for Kotlin"
36+
version = "0.0.0-SNAPSHOT"
37+
gitVersioning.apply {
38+
refs {
39+
branch(".+") { version = "\${ref}-SNAPSHOT" }
40+
tag("v(?<version>.*)") { version = "\${ref.version}" }
41+
}
42+
43+
// optional fallback configuration in case of no matching ref configuration
44+
rev { version = "\${commit}" }
45+
}
3746

3847
java {
3948
withJavadocJar()
@@ -94,9 +103,10 @@ tasks.withType<JavaCompile> {
94103
}
95104

96105
tasks.wrapper {
97-
gradleVersion = "7.3.2"
106+
gradleVersion = "7.3.3"
98107
distributionType = Wrapper.DistributionType.ALL
99108
}
109+
tasks.assemble { dependsOn(tasks.wrapper) }
100110

101111
tasks.javadoc {
102112
if (JavaVersion.current().isJava9Compatible) {
+1-1
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.3.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)