From da6ec552da74744dff7436f28d3b3b57ae61b047 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Wed, 11 Jun 2025 09:44:04 -0700 Subject: [PATCH 1/2] Remove unnecessary gradle-enterprise.gradle.kts from Yoga Summary: This file is not really necessary. As we don't have a Gradle Enterprise instance anymore, let's just remove it and inline it. Differential Revision: D76436236 --- gradle/gradle-enterprise.gradle.kts.sample | 17 ----------------- settings.gradle.kts | 13 +++++++------ 2 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 gradle/gradle-enterprise.gradle.kts.sample diff --git a/gradle/gradle-enterprise.gradle.kts.sample b/gradle/gradle-enterprise.gradle.kts.sample deleted file mode 100644 index 91940e25ec..0000000000 --- a/gradle/gradle-enterprise.gradle.kts.sample +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -// You can use this script to configure the gradleEnterprise{} block in your build. -// You need to rename this file to ./gradle/gradle-enterprise.gradle.kts in order for -// this to be processed. -extensions.getByName("gradleEnterprise").withGroovyBuilder { - setProperty("server", "https://your-gradle-enterprise-instance.example.com") - getProperty("buildScan").withGroovyBuilder { - "publishAlways"() - "tag"(if(System.getenv("CI") != null) "CI" else "Local") - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index c6952ca21b..3be83568ab 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,10 +19,11 @@ include(":yoga") project(":yoga").projectDir = file("java") -rootProject.name = "yoga-github" - -// If you specify a file inside gradle/gradle-enterprise.gradle.kts -// you can configure your custom Gradle Enterprise instance -if (file("./gradle/gradle-enterprise.gradle.kts").exists()) { - apply(from = "./gradle/gradle-enterprise.gradle.kts") +gradleEnterprise { + buildScan { + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + } } + +rootProject.name = "yoga-github" From 915cab151eabc6b6d76e7ff60fa4f3f595575487 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Wed, 11 Jun 2025 10:21:06 -0700 Subject: [PATCH 2/2] Migrate from OSSRH to Central Portal Summary: This migrates Yoga to publish to Central Portal rather than OSSRC Differential Revision: D76436235 --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 3dec0644a1..6352e5c914 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,8 @@ nexusPublishing { sonatype { username.set(sonatypeUsername) password.set(sonatypePassword) + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) } } }