Skip to content

Commit a0b6a62

Browse files
committed
Try m2 for stage
1 parent 6e95516 commit a0b6a62

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

build-logic/src/main/kotlin/publish.gradle.kts

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ tasks.withType<PublishToMavenRepository>().configureEach {
2424

2525
onlyIf {
2626
publication.artifactId != "testing"
27-
&& !publication.name.lowercase().contains("iosX64".lowercase())
28-
&& !publication.name.lowercase().contains("iosArm64".lowercase())
29-
&& !publication.name.lowercase().contains("macosX64".lowercase())
30-
&& !publication.name.lowercase().contains("macosArm64".lowercase())
31-
&& publication.name != "publishKotlinMultiplatformPublicationToOssRepository"
32-
&& publication.name != "publishJvmPublicationToOssRepository"
27+
// && !publication.name.lowercase().contains("iosX64".lowercase())
28+
// && !publication.name.lowercase().contains("iosArm64".lowercase())
29+
// && !publication.name.lowercase().contains("macosX64".lowercase())
30+
// && !publication.name.lowercase().contains("macosArm64".lowercase())
31+
// && publication.name != "publishKotlinMultiplatformPublicationToOssRepository"
32+
// && publication.name != "publishJvmPublicationToOssRepository"
3333
}
3434
}
3535

@@ -52,9 +52,14 @@ publishing {
5252
maven {
5353
name = "Oss"
5454
setUrl {
55-
val repositoryId = System.getenv("STAGING_REPO_ID")
56-
if (repositoryId.trim().isEmpty() || repositoryId.trim() == "") error("STAGING_REPO_ID is empty")
57-
"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deployByRepositoryId/$repositoryId/"
55+
if (!HostManager.hostIsMac) {
56+
val repositoryId = System.getenv("STAGING_REPO_ID")
57+
if (repositoryId.trim().isEmpty() || repositoryId.trim() == "") error("STAGING_REPO_ID is empty")
58+
"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deployByRepositoryId/$repositoryId/"
59+
} else {
60+
// For macOS builds, create the default repo
61+
"https://ossrh-staging-api.central.sonatype.com/service/local/staging/maven2/"
62+
}
5863
}
5964
credentials {
6065
username = user

build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ tasks.register("publishLinuxLocal") {
2929
}
3030

3131
tasks.register("publishMac") {
32-
//Release.macBuildCommands.forEach {
33-
// dependsOn(gradle.includedBuild(Release.Project.`terpal-runtime`).task(":$it"))
34-
//}
35-
dependsOn(
36-
gradle.includedBuild(Release.Project.`terpal-runtime`).task(":publishAllPublicationsToOssRepository")
37-
)
32+
Release.macBuildCommands.forEach {
33+
dependsOn(gradle.includedBuild(Release.Project.`terpal-runtime`).task(":$it"))
34+
}
35+
//dependsOn(
36+
// gradle.includedBuild(Release.Project.`terpal-runtime`).task(":publishAllPublicationsToOssRepository")
37+
//)
3838
}
3939

4040
tasks.register("publishWindows") {

0 commit comments

Comments
 (0)