Skip to content

Commit 2f6ade2

Browse files
ilya-gilya-g
committed
Update kotlinx.team.infra version
- Update TC settings scripts version - Cleanup TC settings - Cleanup deprecations in gradle build scripts
1 parent dbb153f commit 2f6ade2

File tree

6 files changed

+116
-127
lines changed

6 files changed

+116
-127
lines changed

‎.teamcity/additionalConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
44
*/
55

6-
import jetbrains.buildServer.configs.kotlin.v2019_2.Project
7-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
6+
import jetbrains.buildServer.configs.kotlin.Project
7+
import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
88

99
fun Project.additionalConfiguration() {
1010
knownBuilds.buildAll.features {

‎.teamcity/pom.xml

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
1-
<?xml version="1.0"?>
2-
<project>
3-
<modelVersion>4.0.0</modelVersion>
4-
<name>TeamCity Config DSL Script</name>
5-
<groupId>kotlinx.team.infra</groupId>
6-
<artifactId>teamcity</artifactId>
7-
<version>1.0-SNAPSHOT</version>
8-
9-
<parent>
10-
<groupId>org.jetbrains.teamcity</groupId>
11-
<artifactId>configs-dsl-kotlin-parent</artifactId>
12-
<version>1.0-SNAPSHOT</version>
13-
</parent>
14-
15-
<repositories>
16-
<repository>
17-
<id>jetbrains-all</id>
18-
<url>https://download.jetbrains.com/teamcity-repository</url>
19-
<snapshots>
20-
<enabled>true</enabled>
21-
</snapshots>
22-
</repository>
23-
<repository>
24-
<id>teamcity-server</id>
25-
<url>https://teamcity.jetbrains.com/app/dsl-plugins-repository</url>
26-
<snapshots>
27-
<enabled>true</enabled>
28-
</snapshots>
29-
</repository>
30-
</repositories>
31-
32-
<pluginRepositories>
33-
<pluginRepository>
34-
<id>JetBrains</id>
35-
<url>https://download.jetbrains.com/teamcity-repository</url>
36-
</pluginRepository>
37-
</pluginRepositories>
38-
39-
<build>
40-
<sourceDirectory>.</sourceDirectory>
41-
<plugins>
42-
<plugin>
43-
<artifactId>kotlin-maven-plugin</artifactId>
44-
<groupId>org.jetbrains.kotlin</groupId>
45-
<version>${kotlin.version}</version>
46-
47-
<configuration/>
48-
<executions>
49-
<execution>
50-
<id>compile</id>
51-
<phase>process-sources</phase>
52-
<goals>
53-
<goal>compile</goal>
54-
</goals>
55-
</execution>
56-
<execution>
57-
<id>test-compile</id>
58-
<phase>process-test-sources</phase>
59-
<goals>
60-
<goal>test-compile</goal>
61-
</goals>
62-
</execution>
63-
</executions>
64-
</plugin>
65-
<plugin>
66-
<groupId>org.jetbrains.teamcity</groupId>
67-
<artifactId>teamcity-configs-maven-plugin</artifactId>
68-
<version>${teamcity.dsl.version}</version>
69-
<configuration>
70-
<format>kotlin</format>
71-
<dstDir>target/generated-configs</dstDir>
72-
</configuration>
73-
</plugin>
74-
</plugins>
75-
</build>
76-
77-
<dependencies>
78-
<dependency>
79-
<groupId>org.jetbrains.teamcity</groupId>
80-
<artifactId>configs-dsl-kotlin</artifactId>
81-
<version>${teamcity.dsl.version}</version>
82-
<scope>compile</scope>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.jetbrains.teamcity</groupId>
86-
<artifactId>configs-dsl-kotlin-plugins</artifactId>
87-
<version>1.0-SNAPSHOT</version>
88-
<type>pom</type>
89-
<scope>compile</scope>
90-
</dependency>
91-
<dependency>
92-
<groupId>org.jetbrains.kotlin</groupId>
93-
<artifactId>kotlin-stdlib-jdk8</artifactId>
94-
<version>${kotlin.version}</version>
95-
<scope>compile</scope>
96-
</dependency>
97-
<dependency>
98-
<groupId>org.jetbrains.kotlin</groupId>
99-
<artifactId>kotlin-script-runtime</artifactId>
100-
<version>${kotlin.version}</version>
101-
<scope>compile</scope>
102-
</dependency>
103-
</dependencies>
1+
<?xml version="1.0"?>
2+
<project>
3+
<modelVersion>4.0.0</modelVersion>
4+
<name>TeamCity Config DSL Script</name>
5+
<groupId>kotlinx.team.infra</groupId>
6+
<artifactId>teamcity</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
9+
<parent>
10+
<groupId>org.jetbrains.teamcity</groupId>
11+
<artifactId>configs-dsl-kotlin-parent</artifactId>
12+
<version>1.0-SNAPSHOT</version>
13+
</parent>
14+
15+
<repositories>
16+
<repository>
17+
<id>jetbrains-all</id>
18+
<url>https://download.jetbrains.com/teamcity-repository</url>
19+
<snapshots>
20+
<enabled>true</enabled>
21+
</snapshots>
22+
</repository>
23+
<repository>
24+
<id>teamcity-server</id>
25+
<url>https://teamcity.jetbrains.com/app/dsl-plugins-repository</url>
26+
<snapshots>
27+
<enabled>true</enabled>
28+
</snapshots>
29+
</repository>
30+
</repositories>
31+
32+
<pluginRepositories>
33+
<pluginRepository>
34+
<id>JetBrains</id>
35+
<url>https://download.jetbrains.com/teamcity-repository</url>
36+
</pluginRepository>
37+
</pluginRepositories>
38+
39+
<build>
40+
<sourceDirectory>.</sourceDirectory>
41+
<plugins>
42+
<plugin>
43+
<artifactId>kotlin-maven-plugin</artifactId>
44+
<groupId>org.jetbrains.kotlin</groupId>
45+
<version>${kotlin.version}</version>
46+
47+
<configuration/>
48+
<executions>
49+
<execution>
50+
<id>compile</id>
51+
<phase>process-sources</phase>
52+
<goals>
53+
<goal>compile</goal>
54+
</goals>
55+
</execution>
56+
<execution>
57+
<id>test-compile</id>
58+
<phase>process-test-sources</phase>
59+
<goals>
60+
<goal>test-compile</goal>
61+
</goals>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
<plugin>
66+
<groupId>org.jetbrains.teamcity</groupId>
67+
<artifactId>teamcity-configs-maven-plugin</artifactId>
68+
<version>${teamcity.dsl.version}</version>
69+
<configuration>
70+
<format>kotlin</format>
71+
<dstDir>target/generated-configs</dstDir>
72+
</configuration>
73+
</plugin>
74+
</plugins>
75+
</build>
76+
77+
<dependencies>
78+
<dependency>
79+
<groupId>org.jetbrains.teamcity</groupId>
80+
<artifactId>configs-dsl-kotlin-latest</artifactId>
81+
<version>${teamcity.dsl.version}</version>
82+
<scope>compile</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.jetbrains.teamcity</groupId>
86+
<artifactId>configs-dsl-kotlin-plugins-latest</artifactId>
87+
<version>1.0-SNAPSHOT</version>
88+
<type>pom</type>
89+
<scope>compile</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.jetbrains.kotlin</groupId>
93+
<artifactId>kotlin-stdlib-jdk8</artifactId>
94+
<version>${kotlin.version}</version>
95+
<scope>compile</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.jetbrains.kotlin</groupId>
99+
<artifactId>kotlin-script-runtime</artifactId>
100+
<version>${kotlin.version}</version>
101+
<scope>compile</scope>
102+
</dependency>
103+
</dependencies>
104104
</project>

‎.teamcity/settings.kts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import jetbrains.buildServer.configs.kotlin.v2019_2.*
2-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.*
3-
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.*
1+
import jetbrains.buildServer.configs.kotlin.*
2+
import jetbrains.buildServer.configs.kotlin.buildSteps.*
3+
import jetbrains.buildServer.configs.kotlin.triggers.*
44

55
/*
66
The settings script is an entry point for defining a TeamCity
@@ -24,7 +24,7 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
2424
'Debug' option is available in the context menu for the task.
2525
*/
2626

27-
version = "2020.1"
27+
version = "2023.05"
2828

2929
project {
3030
// Disable editing of project and build settings from the UI to avoid issues with TeamCity
@@ -142,8 +142,6 @@ fun Project.deployVersion() = BuildType {
142142
params {
143143
// enable editing of this configuration to set up things
144144
param("teamcity.ui.settings.readOnly", "false")
145-
param("bintray-user", bintrayUserName)
146-
password("bintray-key", bintrayToken)
147145
param(versionSuffixParameter, "dev-%build.counter%")
148146
param("reverse.dep.$BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID.system.libs.repo.description", libraryStagingRepoDescription)
149147
param("env.libs.repository.id", "%dep.$BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID.env.libs.repository.id%")
@@ -158,7 +156,7 @@ fun Project.deployVersion() = BuildType {
158156
gradle {
159157
name = "Verify Gradle Configuration"
160158
tasks = "clean publishPrepareVersion"
161-
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
159+
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter%"
162160
buildFile = ""
163161
jdkHome = "%env.$jdk%"
164162
}
@@ -188,8 +186,6 @@ fun Project.deploy(platform: Platform, configureBuild: BuildType) = buildType("D
188186
params {
189187
param(versionSuffixParameter, "${configureBuild.depParamRefs[versionSuffixParameter]}")
190188
param(releaseVersionParameter, "${configureBuild.depParamRefs[releaseVersionParameter]}")
191-
param("bintray-user", bintrayUserName)
192-
password("bintray-key", bintrayToken)
193189
param("env.libs.repository.id", "%dep.$BUILD_CREATE_STAGING_REPO_ABSOLUTE_ID.env.libs.repository.id%")
194190
}
195191

@@ -202,7 +198,7 @@ fun Project.deploy(platform: Platform, configureBuild: BuildType) = buildType("D
202198
name = "Deploy ${platform.buildTypeName()} Binaries"
203199
jdkHome = "%env.$jdk%"
204200
jvmArgs = "-Xmx1g"
205-
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter% -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
201+
gradleParams = "--info --stacktrace -P$versionSuffixParameter=%$versionSuffixParameter% -P$releaseVersionParameter=%$releaseVersionParameter%"
206202
tasks = "clean publish"
207203
buildFile = ""
208204
gradleWrapperPath = ""

‎.teamcity/utils.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
44
*/
55

6-
import jetbrains.buildServer.configs.kotlin.v2019_2.*
6+
import jetbrains.buildServer.configs.kotlin.*
77

88
const val versionSuffixParameter = "versionSuffix"
99
const val teamcitySuffixParameter = "teamcitySuffix"
1010
const val releaseVersionParameter = "releaseVersion"
1111

12-
const val bintrayUserName = "%env.BINTRAY_USER%"
13-
const val bintrayToken = "%env.BINTRAY_API_KEY%"
1412
const val libraryStagingRepoDescription = "Kotlin-DateTime-library"
1513

1614
val platforms = Platform.values()

‎build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
plugins {
2-
id("kotlinx.team.infra") version "0.3.0-dev-64"
2+
id("kotlinx.team.infra") version "0.4.0-dev-80"
33
kotlin("multiplatform") apply false
44
}
55

66
infra {
77
teamcity {
8-
libraryStagingRepoDescription = project.name
98
}
109
publishing {
1110
include(":kotlinx-datetime")
1211
libraryRepoUrl = "https://github.com/Kotlin/kotlinx-datetime"
13-
sonatype { }
12+
sonatype {
13+
libraryStagingRepoDescription = project.name
14+
}
1415
}
1516
}
1617

‎core/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,3 @@ tasks.withType<AbstractDokkaLeafTask>().configureEach {
386386
}
387387
}
388388
}
389-
390-
// TODO: Move to kotlinx.team.infra
391-
val signingTasks = tasks.withType<Sign>()
392-
tasks.withType<AbstractPublishToMaven>().configureEach {
393-
mustRunAfter(signingTasks)
394-
}

0 commit comments

Comments
 (0)