Skip to content

Commit 983bcdb

Browse files
authored
misc: remove use of hllPreviewVersion (#1746)
1 parent bbe389d commit 983bcdb

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

hll/build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,9 @@ val optinAnnotations = listOf(
3232
"kotlin.RequiresOptIn",
3333
)
3434

35-
private fun String.ensureSuffix(suffix: String): String = if (endsWith(suffix)) this else plus(suffix)
36-
37-
val hllPreviewVersion = if (sdkVersion.contains("-SNAPSHOT")) { // e.g. 1.3.29-beta-SNAPSHOT
38-
sdkVersion
39-
.removeSuffix("-SNAPSHOT")
40-
.ensureSuffix("-beta-SNAPSHOT")
41-
} else {
42-
sdkVersion.ensureSuffix("-beta") // e.g. 1.3.29-beta
43-
}
44-
4535
subprojects {
4636
group = "aws.sdk.kotlin"
47-
version = hllPreviewVersion
37+
version = sdkVersion
4838
// TODO Use configurePublishing when migrating to Sonatype Publisher API / JReleaser
4939
configurePublishing("aws-sdk-kotlin")
5040
}

hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/build.gradle.kts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,6 @@ tasks.test {
8989
// FIXME Commonize the following functions into the aws-kotlin-repo-tools build-support
9090
val sdkVersion: String by project
9191

92-
private fun String.ensureSuffix(suffix: String): String = if (endsWith(suffix)) this else plus(suffix)
93-
94-
val hllPreviewVersion = if (sdkVersion.contains("-SNAPSHOT")) { // e.g. 1.3.29-beta-SNAPSHOT
95-
sdkVersion
96-
.removeSuffix("-SNAPSHOT")
97-
.ensureSuffix("-beta-SNAPSHOT")
98-
} else {
99-
sdkVersion.ensureSuffix("-beta") // e.g. 1.3.29-beta
100-
}
101-
10292
/**
10393
* Create a file containing the sdkVersion to use as a resource
10494
* This saves us from having to manually change version numbers in multiple places
@@ -111,7 +101,7 @@ val generateSdkVersionFile by tasks.registering {
111101
outputs.file(versionFile)
112102
sourceSets.main.get().output.dir(resourcesDir)
113103
doLast {
114-
versionFile.writeText(hllPreviewVersion)
104+
versionFile.writeText(sdkVersion)
115105
}
116106
}
117107

0 commit comments

Comments
 (0)