Merge remote-tracking branch 'JetBrains/master'

# Conflicts:
#	kotlin-dsl/UnityStep.xml
#	plugin-unity-agent/src/main/kotlin/jetbrains/buildServer/unity/logging/UnityLoggingListener.kt

Author: FrantisekHolubec

.editorconfig

@@ -10,4 +10,5 @@ indent_size = 4
 
 [*.{kt,kts}]
 ktlint_code_style = ktlint_official
-ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_trailing-comma-on-call-site = disabled

.teamcity/settings.kts

@@ -1,48 +1,32 @@
 import jetbrains.buildServer.configs.kotlin.BuildType
+import jetbrains.buildServer.configs.kotlin.DslContext
 import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests
 import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher
 import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests
 import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.buildSteps.kotlinFile
 import jetbrains.buildServer.configs.kotlin.project
 import jetbrains.buildServer.configs.kotlin.triggers.vcs
-import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot
 import jetbrains.buildServer.configs.kotlin.version
 
-version = "2024.03"
+version = "2026.1"
 
 project {
-    vcsRoot(TagReleaseVcs)
-    vcsRoot(PullRequestVcs)
-    vcsRoot(MasterVcs)
-
     buildType(ReleaseBuildConfiguration)
-    buildType(PullRequestBuildConfiguration)
     buildType(MasterBuildConfiguration)
 }
 
-object TagReleaseVcs : GitVcsRoot({
-    id("TeamCityUnityPlugin_TagReleaseVcs")
-    name = "TagReleaseVcs"
-    url = "https://github.com/JetBrains/teamcity-unity-plugin.git"
-    branch = "master"
-    useTagsAsBranches = true
-    branchSpec = """
-        +:refs/(tags/*)
-        -:<default>
-    """.trimIndent()
-})
-
 object ReleaseBuildConfiguration : BuildType({
     id("TeamCityUnityPlugin_ReleaseBuild")
-    name = "ReleaseBuild"
+    name = "Unity Plugin: release build"
 
     params {
         password("env.ORG_GRADLE_PROJECT_jetbrains.marketplace.token", "credentialsJSON:1a57eff8-4658-4747-a7ff-e6cdbb3dbb6e", readOnly = true)
     }
 
     vcs {
-        root(TagReleaseVcs)
+        root(DslContext.settingsRoot)
+        branchFilter = "+:tags/*"
     }
 
     steps {
@@ -70,31 +54,24 @@ object ReleaseBuildConfiguration : BuildType({
     }
 })
 
-object PullRequestVcs : GitVcsRoot({
-    id("TeamCityUnityPlugin_PullRequestVcs")
-    name = "PullRequestVcs"
-    url = "https://github.com/JetBrains/teamcity-unity-plugin.git"
-    branchSpec = """
-        -:<default>
-    """.trimIndent()
-})
+object MasterBuildConfiguration : BuildType({
+    id("TeamCityUnityPlugin_MasterBuild")
+    name = "Unity Plugin: master and PRs"
 
-object PullRequestBuildConfiguration : BuildType({
-    id("TeamCityUnityPlugin_PullRequestBuild")
-    name = "PullRequestBuild"
+    allowExternalStatus = true
 
-    val githubTokenParameter = "GITHUB_TOKEN"
-    params {
-        password(githubTokenParameter, "credentialsJSON:da577601-ec6c-4387-8996-e14771fe5ca2", readOnly = true)
+    vcs {
+        root(DslContext.settingsRoot)
     }
 
-    vcs {
-        root(PullRequestVcs)
+    val githubTokenParameter = "GITHUB_TOKEN"
+    params {
+        password(githubTokenParameter, "credentialsJSON:c2a1efe4-4a6e-4908-a12b-f61147f8028d", readOnly = true)
     }
 
     features {
         pullRequests {
-            vcsRootExtId = PullRequestVcs.id?.value
+            vcsRootExtId = DslContext.settingsRoot.id?.value
             provider = github {
                 filterTargetBranch = "refs/heads/master"
                 filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER_OR_COLLABORATOR
@@ -104,7 +81,7 @@ object PullRequestBuildConfiguration : BuildType({
             }
         }
         commitStatusPublisher {
-            vcsRootExtId = PullRequestVcs.id?.value
+            vcsRootExtId = DslContext.settingsRoot.id?.value
             publisher = github {
                 githubUrl = "https://api.github.com"
                 authType = personalToken {
@@ -126,37 +103,6 @@ object PullRequestBuildConfiguration : BuildType({
             tasks = "clean build serverPlugin"
         }
     }
-})
-
-object MasterVcs : GitVcsRoot({
-    id("TeamCityUnityPlugin_MasterVcs")
-    name = "MasterVcs"
-    url = "https://github.com/JetBrains/teamcity-unity-plugin.git"
-    branch = "master"
-})
-
-object MasterBuildConfiguration : BuildType({
-    id("TeamCityUnityPlugin_MasterBuild")
-    name = "MasterBuild"
-
-    allowExternalStatus = true
-
-    vcs {
-        root(MasterVcs)
-    }
-
-    triggers {
-        vcs {
-            branchFilter = "+:*"
-        }
-    }
-
-    steps {
-        gradle {
-            name = "build"
-            tasks = "clean build serverPlugin"
-        }
-    }
 
     artifactRules = "+:./plugin-unity-server/build/distributions/plugin-unity-server.zip"
 })

kotlin-dsl/UnityStep.xml

@@ -28,8 +28,16 @@
                 The class should be located in the Assets/Editor project directory.
             </description>
         </param>
+        <param name="buildProfile" dslName="buildProfile">
+            <description>
+                Specify the project-relative path to a Unity Build Profile asset
+                (e.g. Assets/Settings/Build Profiles/Android-Release.asset).
+                When set, -activeBuildProfile is used instead of -buildTarget.
+                Requires Unity 6 (6000.x) or later.
+            </description>
+        </param>
         <param name="buildTarget" dslName="buildTarget">
-            <description>Specify an active build target before loading the project.</description>
+            <description>Specify an active build target before loading the project. Not used when Build Profile is set.</description>
         </param>
         <param name="buildPlayer" dslName="buildPlayer" type="compound">
             <option name="">
@@ -44,7 +52,12 @@
             <option name="Windows" value="buildWindowsPlayer"/>
             <option name="Windows64" value="buildWindows64Player"/>
         </param>
-        <param name="buildPlayerPath" dslName="playerPath"/>
+        <param name="buildPlayerPath" dslName="playerPath">
+            <description>
+                Specify the output path for the player binary. When Build Profile is set, this path is passed
+                to -build instead of -buildPlayer.
+            </description>
+        </param>
         <param name="runEditorTests" type="compound" dslName="runTests">
             <option name="editorTests" value="true">
                 <description>Run editor tests from the project</description>

plugin-unity-agent/src/main/kotlin/jetbrains/buildServer/unity/BuildCommandExecutionAdapter.kt

@@ -1,5 +1,3 @@
-
-
 package jetbrains.buildServer.unity
 
 import jetbrains.buildServer.agent.BuildFinishedStatus

plugin-unity-agent/src/main/kotlin/jetbrains/buildServer/unity/UnityBuildSessionFactory.kt

@@ -1,5 +1,3 @@
-
-
 package jetbrains.buildServer.unity
 
 import jetbrains.buildServer.agent.AgentBuildRunnerInfo

plugin-unity-agent/src/main/kotlin/jetbrains/buildServer/unity/UnityCommandBuildSession.kt

@@ -1,5 +1,3 @@
-
-
 package jetbrains.buildServer.unity
 
 import jetbrains.buildServer.agent.BuildFinishedStatus