From 83b9768859821d27dcf16938580acb39392f5694 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Wed, 11 Dec 2024 16:06:36 +0100 Subject: [PATCH] Don't publish `build-helpers`, use it directly Fixes https://youtrack.jetbrains.com/issue/CMP-1339/Change-description-of-androidx-artifacts-in-Maven-Central-stage We need some changes in it: https://youtrack.jetbrains.com/issue/CMP-7198/Maven-Central-publication-publishes-old-artifacts-for-Core-Bundle https://youtrack.jetbrains.com/issue/CMP-1339/Change-description-of-androidx-artifacts-in-Maven-Central-stage and the current workflow is complicated: - make changes - publish this as a library in the dev repo - add this as a dependency in some Gradle project (Example https://github.com/JetBrains/compose-multiplatform-core/blob/2d8c5f479f590305b9fedc744e00fdc9c276bbb9/mpp/build.gradle.kts#L286) - Run the gradle task on CI from compose-multiplatform-core project ``` clone compose-multiplatform-core ./gradlew reuploadArtifactsToMavenCentral --info --stacktrace -Pmaven.central.sign=true -Pmaven.central.group=$group -Pmaven.central.stage=$stage -Pmaven.central.version=$version -Pmaven.central.staging.close.after.upload=true ``` This task also doesn't use any of `compose-multiplatform-core` info, so it is overhead to store it as part of this project. Now we just change some code, and it is already can be run by CI. Related change on CI: https://jetbrains.team/p/ui/repositories/compose-teamcity-config/revision/14790a506883923b25ef9ef4d05802f6210362f3 Related change in core: TODO ## Testing 1. Run https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_UploadToMavenCentralManually on branch igor.demin/upload-to-maven-central-without-library with: 2. See: --- build-helpers/build.gradle.kts | 78 ------------------ build-helpers/gradle.properties | 1 - build-helpers/publishing/build.gradle.kts | 51 ------------ build-helpers/settings.gradle.kts | 1 - ci/build-helpers/build.gradle.kts | 77 +++++++++++++++++ ci/build-helpers/buildSrc/build.gradle.kts | 26 ++++++ .../publishing/DownloadFromSpaceTask.kt | 0 .../publishing/FindModulesInSpaceTask.kt | 0 .../FixModulesBeforePublishingTask.kt | 0 .../publishing/MavenCentralProperties.kt | 0 .../internal/publishing/ModuleToUpload.kt | 0 .../publishing/UploadToSonatypeTask.kt | 0 .../publishing/utils/AbstractRestApiClient.kt | 0 .../internal/publishing/utils/Checksum.kt | 0 .../compose/internal/publishing/utils/Json.kt | 0 .../publishing/utils/ModuleValidator.kt | 0 .../internal/publishing/utils/PomDocument.kt | 0 .../internal/publishing/utils/RequestError.kt | 0 .../internal/publishing/utils/SonatypeApi.kt | 0 .../publishing/utils/SonatypeRestApiClient.kt | 0 .../publishing/utils/SpaceApiClient.kt | 0 .../compose/internal/publishing/utils/Xml.kt | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 2 +- {build-helpers => ci/build-helpers}/gradlew | 0 .../build-helpers}/gradlew.bat | 0 ci/build-helpers/settings.gradle.kts | 0 27 files changed, 104 insertions(+), 132 deletions(-) delete mode 100644 build-helpers/build.gradle.kts delete mode 100644 build-helpers/gradle.properties delete mode 100644 build-helpers/publishing/build.gradle.kts delete mode 100644 build-helpers/settings.gradle.kts create mode 100644 ci/build-helpers/build.gradle.kts create mode 100644 ci/build-helpers/buildSrc/build.gradle.kts rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/DownloadFromSpaceTask.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/FindModulesInSpaceTask.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/FixModulesBeforePublishingTask.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/MavenCentralProperties.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/ModuleToUpload.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/UploadToSonatypeTask.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/AbstractRestApiClient.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Checksum.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Json.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/ModuleValidator.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/PomDocument.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/RequestError.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeApi.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeRestApiClient.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SpaceApiClient.kt (100%) rename {build-helpers/publishing => ci/build-helpers/buildSrc}/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Xml.kt (100%) rename {build-helpers => ci/build-helpers}/gradle/wrapper/gradle-wrapper.jar (100%) rename {build-helpers => ci/build-helpers}/gradle/wrapper/gradle-wrapper.properties (93%) rename {build-helpers => ci/build-helpers}/gradlew (100%) rename {build-helpers => ci/build-helpers}/gradlew.bat (100%) create mode 100644 ci/build-helpers/settings.gradle.kts diff --git a/build-helpers/build.gradle.kts b/build-helpers/build.gradle.kts deleted file mode 100644 index e7c1818aac3..00000000000 --- a/build-helpers/build.gradle.kts +++ /dev/null @@ -1,78 +0,0 @@ -plugins { - kotlin("jvm") version "1.5.30" apply false - id("com.github.johnrengelman.shadow") version "7.1.0" apply false -} - -subprojects { - group = "org.jetbrains.compose.internal.build-helpers" - version = project.property("deploy.version") as String - - repositories { - mavenCentral() - } - - plugins.withType(JavaBasePlugin::class.java) { - afterEvaluate { - configureIfExists { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - if (sourceSets.names.contains(SourceSet.MAIN_SOURCE_SET_NAME)) { - withJavadocJar() - withSourcesJar() - } - } - } - } - - plugins.withId("maven-publish") { - configureIfExists { - configurePublishing(project) - } - } -} - -fun PublishingExtension.configurePublishing(project: Project) { - repositories { - configureEach { - val repoName = name - project.tasks.register("publishTo${repoName}") { - group = "publishing" - dependsOn(project.tasks.named("publishAllPublicationsTo${repoName}Repository")) - } - } - maven { - name = "BuildRepo" - url = uri("${rootProject.buildDir}/repo") - } - maven { - name = "ComposeInternalRepo" - url = uri( - System.getenv("COMPOSE_INTERNAL_REPO_URL") - ?: "https://maven.pkg.jetbrains.space/public/p/compose/internal" - ) - credentials { - username = - System.getenv("COMPOSE_INTERNAL_REPO_USERNAME") - ?: System.getenv("COMPOSE_REPO_USERNAME") - ?: "" - password = - System.getenv("COMPOSE_INTERNAL_REPO_KEY") - ?: System.getenv("COMPOSE_REPO_KEY") - ?: "" - } - } - } - publications { - create("main") { - groupId = project.group.toString() - artifactId = project.name - version = project.version.toString() - - from(project.components["java"]) - } - } -} - -inline fun Project.configureIfExists(fn: T.() -> Unit) { - extensions.findByType(T::class.java)?.fn() -} diff --git a/build-helpers/gradle.properties b/build-helpers/gradle.properties deleted file mode 100644 index 2e5973b32e9..00000000000 --- a/build-helpers/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -deploy.version=0.1.0-SNAPSHOT diff --git a/build-helpers/publishing/build.gradle.kts b/build-helpers/publishing/build.gradle.kts deleted file mode 100644 index 873a657fcb6..00000000000 --- a/build-helpers/publishing/build.gradle.kts +++ /dev/null @@ -1,51 +0,0 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.kotlin.dsl.gradleKotlinDsl - -plugins { - `java` - `maven-publish` - `java-gradle-plugin` - id("org.jetbrains.kotlin.jvm") - id("com.github.johnrengelman.shadow") apply false -} - -repositories { - maven("https://maven.pkg.jetbrains.space/public/p/space/maven") -} - -val embeddedDependencies by configurations.creating { isTransitive = false } -dependencies { - compileOnly(gradleApi()) - compileOnly(gradleKotlinDsl()) - compileOnly(kotlin("stdlib")) - - fun embedded(dep: String) { - compileOnly(dep) - embeddedDependencies(dep) - } - - val jacksonVersion = "2.12.5" - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") - implementation("io.ktor:ktor-client-okhttp:1.6.4") - implementation("org.apache.tika:tika-parsers:1.24.1") - implementation("org.jsoup:jsoup:1.14.3") - implementation("org.jetbrains:space-sdk-jvm:83821-beta") - embedded("de.undercouch:gradle-download-task:4.1.2") -} - -val shadowJar by tasks.registering(ShadowJar::class) { - val fromPackage = "de.undercouch" - val toPackage = "org.jetbrains.compose.internal.publishing.$fromPackage" - relocate(fromPackage, toPackage) - archiveClassifier.set("shadow") - configurations = listOf(embeddedDependencies) - from(sourceSets["main"]!!.output) - exclude("META-INF/gradle-plugins/de.undercouch.download.properties") -} - -val jar = tasks.named("jar") { - dependsOn(shadowJar) - from(zipTree(shadowJar.get().archiveFile)) - this.duplicatesStrategy = DuplicatesStrategy.INCLUDE -} \ No newline at end of file diff --git a/build-helpers/settings.gradle.kts b/build-helpers/settings.gradle.kts deleted file mode 100644 index f5b6ed4d85b..00000000000 --- a/build-helpers/settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -include(":publishing") diff --git a/ci/build-helpers/build.gradle.kts b/ci/build-helpers/build.gradle.kts new file mode 100644 index 00000000000..b3074877cdb --- /dev/null +++ b/ci/build-helpers/build.gradle.kts @@ -0,0 +1,77 @@ +import org.jetbrains.compose.internal.publishing.* + +plugins { + signing +} + +val mavenCentral = MavenCentralProperties(project) +val mavenCentralGroup = project.providers.gradleProperty("maven.central.group") +val mavenCentralStage = project.providers.gradleProperty("maven.central.stage") +if (mavenCentral.signArtifacts) { + signing.useInMemoryPgpKeys( + mavenCentral.signArtifactsKey.get(), + mavenCentral.signArtifactsPassword.get() + ) +} + +val publishingDir = project.layout.buildDirectory.dir("publishing") +val originalArtifactsRoot = publishingDir.map { it.dir("original") } +val preparedArtifactsRoot = publishingDir.map { it.dir("prepared") } +val modulesFile = publishingDir.map { it.file("modules.txt") } + +val findComposeModules by tasks.registering(FindModulesInSpaceTask::class) { + requestedGroupId.set(mavenCentralGroup) + requestedVersion.set(mavenCentral.version) + spaceInstanceUrl.set("https://public.jetbrains.space") + spaceClientId.set(System.getenv("COMPOSE_REPO_USERNAME") ?: "") + spaceClientSecret.set(System.getenv("COMPOSE_REPO_KEY") ?: "") + spaceProjectId.set(System.getenv("COMPOSE_DEV_REPO_PROJECT_ID") ?: "") + spaceRepoId.set(System.getenv("COMPOSE_DEV_REPO_REPO_ID") ?: "") + modulesTxtFile.set(modulesFile) +} + +val downloadArtifactsFromComposeDev by tasks.registering(DownloadFromSpaceMavenRepoTask::class) { + dependsOn(findComposeModules) + modulesToDownload.set(project.provider { + readComposeModules( + modulesFile, + originalArtifactsRoot + ) + }) + spaceRepoUrl.set("https://maven.pkg.jetbrains.space/public/p/compose/dev") +} + +val fixModulesBeforePublishing by tasks.registering(FixModulesBeforePublishingTask::class) { + dependsOn(downloadArtifactsFromComposeDev) + inputRepoDir.set(originalArtifactsRoot) + outputRepoDir.set(preparedArtifactsRoot) +} + +val reuploadArtifactsToMavenCentral by tasks.registering(UploadToSonatypeTask::class) { + dependsOn(fixModulesBeforePublishing) + + version.set(mavenCentral.version) + modulesToUpload.set(project.provider { readComposeModules(modulesFile, preparedArtifactsRoot) }) + + sonatypeServer.set("https://oss.sonatype.org") + user.set(mavenCentral.user) + password.set(mavenCentral.password) + autoCommitOnSuccess.set(mavenCentral.autoCommitOnSuccess) + stagingProfileName.set(mavenCentralStage) +} + +fun readComposeModules( + modulesFile: Provider, + repoRoot: Provider +): List = + modulesFile.get().asFile.readLines() + .filter { it.isNotBlank() } + .map { line -> + val (group, artifact, version) = line.split(":") + ModuleToUpload( + groupId = group, + artifactId = artifact, + version = version, + localDir = repoRoot.get().asFile.resolve("$group/$artifact/$version") + ) + } \ No newline at end of file diff --git a/ci/build-helpers/buildSrc/build.gradle.kts b/ci/build-helpers/buildSrc/build.gradle.kts new file mode 100644 index 00000000000..c1928e81279 --- /dev/null +++ b/ci/build-helpers/buildSrc/build.gradle.kts @@ -0,0 +1,26 @@ +import org.gradle.kotlin.dsl.gradleKotlinDsl + +plugins { + `java` + `java-gradle-plugin` + kotlin("jvm") version "1.9.24" +} + +repositories { + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/space/maven") +} + +dependencies { + compileOnly(gradleApi()) + compileOnly(gradleKotlinDsl()) + + val jacksonVersion = "2.12.5" + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion") + implementation("io.ktor:ktor-client-okhttp:1.6.4") + implementation("org.apache.tika:tika-parsers:1.24.1") + implementation("org.jsoup:jsoup:1.14.3") + implementation("org.jetbrains:space-sdk-jvm:83821-beta") + implementation("de.undercouch:gradle-download-task:4.1.2") +} diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/DownloadFromSpaceTask.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/DownloadFromSpaceTask.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/DownloadFromSpaceTask.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/DownloadFromSpaceTask.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/FindModulesInSpaceTask.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/FindModulesInSpaceTask.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/FindModulesInSpaceTask.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/FindModulesInSpaceTask.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/FixModulesBeforePublishingTask.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/FixModulesBeforePublishingTask.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/FixModulesBeforePublishingTask.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/FixModulesBeforePublishingTask.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/MavenCentralProperties.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/MavenCentralProperties.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/MavenCentralProperties.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/MavenCentralProperties.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/ModuleToUpload.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/ModuleToUpload.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/ModuleToUpload.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/ModuleToUpload.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/UploadToSonatypeTask.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/UploadToSonatypeTask.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/UploadToSonatypeTask.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/UploadToSonatypeTask.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/AbstractRestApiClient.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/AbstractRestApiClient.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/AbstractRestApiClient.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/AbstractRestApiClient.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Checksum.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Checksum.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Checksum.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Checksum.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Json.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Json.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Json.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Json.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/ModuleValidator.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/ModuleValidator.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/ModuleValidator.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/ModuleValidator.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/PomDocument.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/PomDocument.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/PomDocument.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/PomDocument.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/RequestError.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/RequestError.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/RequestError.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/RequestError.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeApi.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeApi.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeApi.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeApi.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeRestApiClient.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeRestApiClient.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeRestApiClient.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SonatypeRestApiClient.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SpaceApiClient.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SpaceApiClient.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SpaceApiClient.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/SpaceApiClient.kt diff --git a/build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Xml.kt b/ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Xml.kt similarity index 100% rename from build-helpers/publishing/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Xml.kt rename to ci/build-helpers/buildSrc/src/main/kotlin/org/jetbrains/compose/internal/publishing/utils/Xml.kt diff --git a/build-helpers/gradle/wrapper/gradle-wrapper.jar b/ci/build-helpers/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from build-helpers/gradle/wrapper/gradle-wrapper.jar rename to ci/build-helpers/gradle/wrapper/gradle-wrapper.jar diff --git a/build-helpers/gradle/wrapper/gradle-wrapper.properties b/ci/build-helpers/gradle/wrapper/gradle-wrapper.properties similarity index 93% rename from build-helpers/gradle/wrapper/gradle-wrapper.properties rename to ci/build-helpers/gradle/wrapper/gradle-wrapper.properties index 69a9715077f..15de90249f9 100644 --- a/build-helpers/gradle/wrapper/gradle-wrapper.properties +++ b/ci/build-helpers/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/build-helpers/gradlew b/ci/build-helpers/gradlew similarity index 100% rename from build-helpers/gradlew rename to ci/build-helpers/gradlew diff --git a/build-helpers/gradlew.bat b/ci/build-helpers/gradlew.bat similarity index 100% rename from build-helpers/gradlew.bat rename to ci/build-helpers/gradlew.bat diff --git a/ci/build-helpers/settings.gradle.kts b/ci/build-helpers/settings.gradle.kts new file mode 100644 index 00000000000..e69de29bb2d