Skip to content

Commit 766af68

Browse files
Replace Allegro release plugin by shipkit-auto-version (#9149)
* chore(build): Replace Allegro release plugin by shipkit-auto-version * chore(build): PR suggestions Co-authored-by: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com> --------- Co-authored-by: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
1 parent 4e4c286 commit 766af68

File tree

2 files changed

+5
-32
lines changed

2 files changed

+5
-32
lines changed

build.gradle

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
buildscript {
2-
dependencies {
3-
classpath "pl.allegro.tech.build:axion-release-plugin:1.14.4"
4-
}
5-
6-
configurations.all {
7-
resolutionStrategy.dependencySubstitution {
8-
substitute module("com.jcraft:jsch") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained"
9-
substitute module("com.jcraft:jsch.agentproxy") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained"
10-
substitute module("com.jcraft:jzlib") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained"
11-
}
12-
}
13-
}
14-
151
plugins {
162
id 'datadog.gradle-debug'
173
id 'datadog.dependency-locking'
@@ -20,7 +6,7 @@ plugins {
206
id 'com.github.spotbugs' version '5.0.14'
217
id 'de.thetaphi.forbiddenapis' version '3.8'
228

23-
id 'pl.allegro.tech.build.axion-release' version '1.14.4'
9+
id 'org.shipkit.shipkit-auto-version' version '2.1.2'
2410
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
2511

2612
id 'com.gradleup.shadow' version '8.3.6' apply false
@@ -34,7 +20,6 @@ description = 'dd-trace-java'
3420
def isCI = System.getenv("CI") != null
3521

3622
apply from: "$rootDir/gradle/repositories.gradle"
37-
apply from: "$rootDir/gradle/scm.gradle"
3823

3924
spotless {
4025
// only resolve the spotless dependencies once in the build
@@ -69,9 +54,11 @@ apply from: "$rootDir/gradle/spotless.gradle"
6954

7055
def compileTask = tasks.register("compile")
7156

57+
def repoVersion = version
58+
7259
allprojects {
7360
group = 'com.datadoghq'
74-
version = scmVersion.version
61+
version = repoVersion
7562

7663
if (isCI) {
7764
buildDir = "$rootDir/workspace/${projectDir.path.replace(rootDir.path, '')}/build/"
@@ -119,7 +106,7 @@ nexusPublishing {
119106

120107
def writeMainVersionFileTask = tasks.register('writeMainVersionFile') {
121108
def versionFile = file("${rootProject.buildDir}/main.version")
122-
inputs.property "version", scmVersion.version
109+
inputs.property "version", project.version
123110
outputs.file versionFile
124111

125112
doFirst {

gradle/scm.gradle

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

0 commit comments

Comments
 (0)