Skip to content

Replace Allegro release plugin by shipkit-auto-version #9149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
buildscript {
dependencies {
classpath "pl.allegro.tech.build:axion-release-plugin:1.14.4"
}

configurations.all {
resolutionStrategy.dependencySubstitution {
substitute module("com.jcraft:jsch") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained"
substitute module("com.jcraft:jsch.agentproxy") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained"
substitute module("com.jcraft:jzlib") using module("com.github.mwiede:jsch:0.2.17") because "jcraft is unmaintained"
}
}
}

plugins {
id 'datadog.gradle-debug'
id 'datadog.dependency-locking'
Expand All @@ -20,7 +6,7 @@ plugins {
id 'com.github.spotbugs' version '5.0.14'
id 'de.thetaphi.forbiddenapis' version '3.8'

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

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

apply from: "$rootDir/gradle/repositories.gradle"
apply from: "$rootDir/gradle/scm.gradle"

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

def compileTask = tasks.register("compile")

def repoVersion = version

allprojects {
group = 'com.datadoghq'
version = scmVersion.version
version = repoVersion

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

def writeMainVersionFileTask = tasks.register('writeMainVersionFile') {
def versionFile = file("${rootProject.buildDir}/main.version")
inputs.property "version", scmVersion.version
inputs.property "version", project.version
outputs.file versionFile

doFirst {
Expand Down
14 changes: 0 additions & 14 deletions gradle/scm.gradle

This file was deleted.