Skip to content

Commit 7dbe20d

Browse files
committed
feat: update Gradle configuration for improved ABI validation and versioning
1 parent 8e5348f commit 7dbe20d

File tree

7 files changed

+45
-48
lines changed

7 files changed

+45
-48
lines changed

build.gradle.kts

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
22
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
33
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmExtension
4+
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
5+
import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationExtension
6+
import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
47

58
buildscript {
69
repositories {
@@ -12,10 +15,6 @@ buildscript {
1215
}
1316
}
1417

15-
plugins {
16-
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.18.1"
17-
}
18-
1918
allprojects {
2019
group = "dev.slne.surf"
2120
version = findProperty("version") as String
@@ -46,11 +45,16 @@ subprojects {
4645
optIn.add("dev.slne.surf.redis.util.InternalRedisAPI")
4746
}
4847
}
49-
}
50-
}
5148

52-
apiValidation {
53-
nonPublicMarkers.add("dev.slne.surf.redis.util.InternalRedisAPI")
54-
apiDumpDirectory = "api"
55-
ignoredProjects.addAll(listOf("surf-redis-core", "surf-redis-paper", "surf-redis-velocity"))
49+
@OptIn(ExperimentalAbiValidation::class)
50+
configure<KotlinJvmProjectExtension> {
51+
configure<AbiValidationExtension> {
52+
filters {
53+
excluded {
54+
annotatedWith.add("dev.slne.surf.redis.util.InternalRedisAPI")
55+
}
56+
}
57+
}
58+
}
59+
}
5660
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ org.gradle.parallel=true
44
#org.gradle.caching=true
55
#org.gradle.configureondemand=true
66

7-
version=1.21.11-1.0.0-SNAPSHOT
7+
version=1.21.11-1.1.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.jar

1.95 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-9.4.0-20260117005955+0000-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 13 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

surf-redis-api/build.gradle.kts

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import dev.slne.surf.surfapi.gradle.util.slneReleases
2+
import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation
23

34
plugins {
45
id("dev.slne.surf.surfapi.gradle.core")
@@ -34,26 +35,18 @@ publishing {
3435
}
3536
}
3637

37-
tasks.test {
38-
useJUnitPlatform()
38+
kotlin {
39+
@OptIn(ExperimentalAbiValidation::class)
40+
abiValidation {
41+
enabled.set(true)
42+
}
3943
}
4044

41-
tasks {
42-
apiBuild {
43-
inputJar.value(shadowJar.flatMap { it.archiveFile })
44-
}
45+
tasks.test {
46+
useJUnitPlatform()
4547
}
4648

4749
java {
4850
withSourcesJar()
4951
withJavadocJar()
50-
}
51-
52-
afterEvaluate {
53-
tasks.named("publishPluginMavenPublicationToMaven-releasesRepository") {
54-
enabled = false
55-
}
56-
tasks.named("publishPluginMavenPublicationToMavenLocal") {
57-
enabled = false
58-
}
59-
}
52+
}

0 commit comments

Comments
 (0)