@@ -33,6 +33,7 @@ val bintrayUserName = "orangy"
33
33
val bintrayToken = " credentialsJSON:9a48193c-d16d-46c7-8751-2fb434b09e07"
34
34
35
35
val platforms = listOf (" Windows" , " Linux" , " Mac OS X" )
36
+ val jdk = " JDK_18_x64"
36
37
37
38
project {
38
39
// Disable editing of project and build settings from the UI to avoid issues with TeamCity
@@ -51,7 +52,7 @@ project {
51
52
}
52
53
buildAll.dependsOn(build) {
53
54
artifacts {
54
- artifactRules = " +:maven=>maven"
55
+ artifactRules = " +:maven=>maven\n +:api=>api "
55
56
}
56
57
}
57
58
}
@@ -88,18 +89,18 @@ fun Project.build(platform: String) = platform(platform, "Build") {
88
89
steps {
89
90
gradle {
90
91
name = " Build and Test $platform Binaries"
91
- jdkHome = " %env.JDK_18_x64 %"
92
+ jdkHome = " %env.$jdk %"
92
93
jvmArgs = " -Xmx1g"
93
94
tasks = " clean publishToBuildLocal check"
94
95
// --continue is needed to run tests for all targets even if one target fails
95
- gradleParams = " -P$versionSuffixParameter =SNAPSHOT -P$teamcitySuffixParameter =%build.counter% --continue"
96
+ gradleParams = " --info --stacktrace - P$versionSuffixParameter =SNAPSHOT -P$teamcitySuffixParameter =%build.counter% --continue"
96
97
buildFile = " "
97
98
gradleWrapperPath = " "
98
99
}
99
100
}
100
101
101
102
// What files to publish as build artifacts
102
- artifactRules = " +:build/maven=>maven"
103
+ artifactRules = " +:build/maven=>maven\n +:build/api=>api "
103
104
}
104
105
105
106
fun BuildType.dependsOn (build : BuildType , configure : Dependency .() -> Unit ) =
@@ -128,8 +129,6 @@ fun Project.deployConfigure() = BuildType {
128
129
param(" bintray-user" , bintrayUserName)
129
130
password(" bintray-key" , bintrayToken)
130
131
param(versionSuffixParameter, " dev-%build.counter%" )
131
- // Intentionally left empty. Gradle will ignore empty values and in custom build it can be specified
132
- param(releaseVersionParameter, " dev" )
133
132
}
134
133
135
134
requirements {
@@ -141,9 +140,9 @@ fun Project.deployConfigure() = BuildType {
141
140
gradle {
142
141
name = " Verify Gradle Configuration"
143
142
tasks = " clean publishBintrayCreateVersion"
144
- gradleParams = " -P$versionSuffixParameter =%$versionSuffixParameter % -P$releaseVersionParameter =%$releaseVersionParameter % -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
143
+ gradleParams = " --info --stacktrace - P$versionSuffixParameter =%$versionSuffixParameter % -P$releaseVersionParameter =%$releaseVersionParameter % -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
145
144
buildFile = " "
146
- jdkHome = " %env.JDK_18 %"
145
+ jdkHome = " %env.$jdk %"
147
146
}
148
147
}
149
148
}.also { buildType(it) }
@@ -154,7 +153,10 @@ fun Project.deployPublish(configureBuild: BuildType) = BuildType {
154
153
type = BuildTypeSettings .Type .COMPOSITE
155
154
params {
156
155
param(versionSuffixParameter, " ${configureBuild.depParamRefs[versionSuffixParameter]} " )
157
- param(releaseVersionParameter, " ${configureBuild.depParamRefs[releaseVersionParameter]} " )
156
+
157
+ // Tell configuration build how to get release version parameter from this build
158
+ // "dev" is the default and means publishing is not releasing to public
159
+ param(configureBuild.reverseDepParamRefs[releaseVersionParameter].name, " dev" )
158
160
}
159
161
commonConfigure()
160
162
}.also { buildType(it) }.dependsOnSnapshot(configureBuild)
@@ -178,9 +180,9 @@ fun Project.deploy(platform: String, configureBuild: BuildType) = platform(platf
178
180
steps {
179
181
gradle {
180
182
name = " Deploy $platform Binaries"
181
- jdkHome = " %env.JDK_18_x64 %"
183
+ jdkHome = " %env.$jdk %"
182
184
jvmArgs = " -Xmx1g"
183
- gradleParams = " -P$versionSuffixParameter =%$versionSuffixParameter % -P$releaseVersionParameter =%$releaseVersionParameter % -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
185
+ gradleParams = " --info --stacktrace - P$versionSuffixParameter =%$versionSuffixParameter % -P$releaseVersionParameter =%$releaseVersionParameter % -PbintrayApiKey=%bintray-key% -PbintrayUser=%bintray-user%"
184
186
tasks = " clean build publish"
185
187
buildFile = " "
186
188
gradleWrapperPath = " "
0 commit comments