From 54725302e02780097e12498b03750909d0e455d0 Mon Sep 17 00:00:00 2001 From: Romano Zabini Date: Mon, 4 Dec 2023 13:38:16 +0100 Subject: [PATCH] remove VersionScmPosition class as it is a duplicate of ScmPosition class (#686) --- .../axion/release/domain/VersionConfig.groovy | 9 +++---- .../release/domain/VersionScmPosition.groovy | 27 ------------------- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionScmPosition.groovy diff --git a/src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionConfig.groovy b/src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionConfig.groovy index 9474231a..7171a83c 100644 --- a/src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionConfig.groovy +++ b/src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionConfig.groovy @@ -11,6 +11,7 @@ import org.gradle.api.tasks.Nested import org.gradle.api.tasks.Optional import pl.allegro.tech.build.axion.release.domain.hooks.HooksConfig import pl.allegro.tech.build.axion.release.domain.properties.VersionProperties +import pl.allegro.tech.build.axion.release.domain.scm.ScmPosition import pl.allegro.tech.build.axion.release.infrastructure.di.MemoizedVersionSupplier import pl.allegro.tech.build.axion.release.infrastructure.di.VersionSupplier @@ -239,11 +240,7 @@ abstract class VersionConfig extends BaseExtension { } @Nested - VersionScmPosition getScmPosition() { - return versionProvider().map({ new VersionScmPosition( - it.position.revision, - it.position.shortRevision, - it.position.branch - )}).get() + ScmPosition getScmPosition() { + return versionProvider().map({it.position}).get() } } diff --git a/src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionScmPosition.groovy b/src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionScmPosition.groovy deleted file mode 100644 index d0336d66..00000000 --- a/src/main/groovy/pl/allegro/tech/build/axion/release/domain/VersionScmPosition.groovy +++ /dev/null @@ -1,27 +0,0 @@ -package pl.allegro.tech.build.axion.release.domain - -import org.gradle.api.tasks.Input - -class VersionScmPosition { - - @Input - final String revision - - @Input - final String shortRevision - - @Input - final String branch - - VersionScmPosition(String revision, String shortRevision, String branch) { - this.revision = revision - this.shortRevision = shortRevision - this.branch = branch - } - - @Override - public String toString() { - return "VersionScmPosition[revision = $revision, shortRevision = $shortRevision, branch = $branch]" - } - -}