Skip to content

Commit b8e0294

Browse files
committed
Deprecate publishing to bintray
1 parent ca4b219 commit b8e0294

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

main/src/kotlinx/team/infra/Publishing.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,27 @@ import java.net.*
1313
import java.text.*
1414
import java.util.*
1515

16+
@Suppress("DEPRECATION")
1617
open class PublishingConfiguration {
18+
@Deprecated("Avoid publishing to bintray")
1719
val bintray = BintrayConfiguration()
20+
@Deprecated("Avoid publishing to bintray")
1821
fun bintray(configure: Action<BintrayConfiguration>) {
1922
configure.execute(bintray)
2023
}
24+
@Deprecated("Avoid publishing to bintray")
2125
fun bintray(configureClosure: Closure<BintrayConfiguration>) {
2226
ConfigureUtil.configureSelf(configureClosure, bintray)
2327
}
2428

29+
@Deprecated("Avoid publishing to bintray")
2530
var bintrayDev: BintrayConfiguration? = null
31+
@Deprecated("Avoid publishing to bintray")
2632
fun bintrayDev(configure: Action<BintrayConfiguration>) {
2733
if (bintrayDev == null) bintrayDev = BintrayConfiguration()
2834
configure.execute(bintrayDev)
2935
}
36+
@Deprecated("Avoid publishing to bintray")
3037
fun bintrayDev(configureClosure: Closure<BintrayConfiguration>) {
3138
if (bintrayDev == null) bintrayDev = BintrayConfiguration()
3239
ConfigureUtil.configureSelf(configureClosure, bintrayDev)
@@ -38,6 +45,10 @@ open class PublishingConfiguration {
3845
}
3946
}
4047

48+
// TODO: Add sonatype configuration
49+
// TODO: Add space configuration
50+
51+
// TODO: Remove all bintray-related configuration after migration
4152
open class BintrayConfiguration {
4253
var username: String? = null
4354
var password: String? = null
@@ -69,6 +80,7 @@ fun Project.configureProjectVersion() {
6980
logger.infra("Configured root project version as '${project.version}'")
7081
}
7182

83+
@Suppress("DEPRECATION")
7284
fun Project.configurePublishing(publishing: PublishingConfiguration) {
7385
val ext = extensions.getByType(ExtraPropertiesExtension::class.java)
7486

main/src/kotlinx/team/infra/TeamCity.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import org.gradle.api.*
44
import java.io.*
55

66
class TeamCityConfiguration {
7+
@Deprecated("Avoid publishing to bintray")
78
var bintrayUser: String? = null
9+
@Deprecated("Avoid publishing to bintray")
810
var bintrayToken: String? = null
911

1012
var jdk = "JDK_18_x64"
@@ -34,11 +36,12 @@ fun Project.configureTeamCityConfigGenerator(teamcity: TeamCityConfiguration) {
3436
it
3537
.replace("<artifactId>resource</artifactId>", "<artifactId>teamcity</artifactId>")
3638
}
39+
@Suppress("DEPRECATION")
3740
copyResource(teamcityDir, "utils.kt") { text ->
3841
val bintrayUser = teamcity.bintrayUser
39-
?: throw KotlinInfrastructureException("TeamCity configuration should specify `bintrayUser` parameter")
42+
?: "%env.BINTRAY_USER%" //throw KotlinInfrastructureException("TeamCity configuration should specify `bintrayUser` parameter")
4043
val bintrayToken = teamcity.bintrayToken
41-
?: throw KotlinInfrastructureException("TeamCity configuration should specify `bintrayToken` parameter")
44+
?: "%env.BINTRAY_API_KEY%" //throw KotlinInfrastructureException("TeamCity configuration should specify `bintrayToken` parameter")
4245
text
4346
.replace("<<BINTRAY_USER>>", bintrayUser)
4447
.replace("<<BINTRAY_TOKEN>>", bintrayToken)

0 commit comments

Comments
 (0)