Skip to content

Commit 5beccd5

Browse files
committed
Update TC DSL version
* regenerate configuration
1 parent b769eeb commit 5beccd5

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

.teamcity/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<dependencies>
7878
<dependency>
7979
<groupId>org.jetbrains.teamcity</groupId>
80-
<artifactId>configs-dsl-kotlin</artifactId>
80+
<artifactId>configs-dsl-kotlin-latest</artifactId>
8181
<version>${teamcity.dsl.version}</version>
8282
<scope>compile</scope>
8383
</dependency>
8484
<dependency>
8585
<groupId>org.jetbrains.teamcity</groupId>
86-
<artifactId>configs-dsl-kotlin-plugins</artifactId>
86+
<artifactId>configs-dsl-kotlin-plugins-latest</artifactId>
8787
<version>1.0-SNAPSHOT</version>
8888
<type>pom</type>
8989
<scope>compile</scope>

.teamcity/settings.kts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import jetbrains.buildServer.configs.kotlin.v2019_2.*
2-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.*
3-
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.*
4-
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.*
54

65
/*
76
The settings script is an entry point for defining a TeamCity
@@ -25,7 +24,7 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
2524
'Debug' option is available in the context menu for the task.
2625
*/
2726

28-
version = "2020.1"
27+
version = "2023.05"
2928

3029
project {
3130
// Disable editing of project and build settings from the UI to avoid issues with TeamCity

.teamcity/utils.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
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"
@@ -12,7 +12,7 @@ const val releaseVersionParameter = "releaseVersion"
1212
const val libraryStagingRepoDescription = "kotlinx-benchmark"
1313

1414
val platforms = Platform.values()
15-
const val jdk = "JDK_18"
15+
const val jdk = "JDK_18_x64"
1616

1717
enum class Platform {
1818
Windows, Linux, MacOS;
@@ -68,7 +68,6 @@ fun Project.buildType(name: String, platform: Platform, configure: BuildType.()
6868
params {
6969
// This parameter is needed for macOS agent to be compatible
7070
if (platform == Platform.MacOS) param("env.JDK_17", "")
71-
if (platform == Platform.MacOS) param("env.JDK_16", "")
7271
}
7372

7473
commonConfigure()
@@ -118,4 +117,4 @@ fun BuildType.dependsOnSnapshot(build: IdOwner, onFailure: FailureAction = Failu
118117
onDependencyCancel = FailureAction.CANCEL
119118
}
120119
}
121-
}
120+
}

0 commit comments

Comments
 (0)