Skip to content

Commit 6bc043d

Browse files
Saadnajmicortinico
andauthored
chore(0.76): Merge the rest of the React Native 0.76 stable branch (#2623)
## Summary: There doesn't seem to be a release to sync to, but we still want to sync and make a new release. Let's do so. --------- Co-authored-by: Nicola Corti <[email protected]>
1 parent ee8d9ff commit 6bc043d

File tree

6 files changed

+11
-25
lines changed

6 files changed

+11
-25
lines changed

.github/workflows/publish-release.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -131,26 +131,6 @@ jobs:
131131
hermes-version: ${{ needs.prepare_hermes_workspace.outputs.hermes-version }}
132132
react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
133133

134-
build_android:
135-
runs-on: 8-core-ubuntu
136-
needs: [set_release_type]
137-
container:
138-
image: reactnativecommunity/react-native-android:latest
139-
env:
140-
TERM: "dumb"
141-
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
142-
ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}
143-
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_KEY }}
144-
ORG_GRADLE_PROJECT_SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_USERNAME }}
145-
ORG_GRADLE_PROJECT_SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_PASSWORD }}
146-
steps:
147-
- name: Checkout
148-
uses: actions/checkout@v4
149-
- name: Build Android
150-
uses: ./.github/actions/build-android
151-
with:
152-
release-type: ${{ needs.set_release_type.outputs.RELEASE_TYPE }}
153-
154134
build_npm_package:
155135
runs-on: 8-core-ubuntu
156136
needs:
@@ -160,7 +140,6 @@ jobs:
160140
build_hermes_macos,
161141
build_hermesc_linux,
162142
build_hermesc_windows,
163-
build_android,
164143
]
165144
container:
166145
image: reactnativecommunity/react-native-android:latest
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
__default__: patch
3+
---
4+
5+
Sync to upstream React Native 0.76 branch

build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ nexusPublishing {
5454
sonatype {
5555
username.set(sonatypeUsername)
5656
password.set(sonatypePassword)
57+
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
58+
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
5759
}
5860
}
5961
}

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal object DependencyUtils {
3434
}
3535
}
3636
// We add the snapshot for users on nightlies.
37-
mavenRepoFromUrl("https://oss.sonatype.org/content/repositories/snapshots/") { repo ->
37+
mavenRepoFromUrl("https://central.sonatype.com/repository/maven-snapshots/") { repo ->
3838
repo.content { it.excludeGroup("org.webkit") }
3939
}
4040
repositories.mavenCentral { repo ->

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class DependencyUtilsTest {
4444

4545
@Test
4646
fun configureRepositories_containsSnapshotRepo() {
47-
val repositoryURI = URI.create("https://oss.sonatype.org/content/repositories/snapshots/")
47+
val repositoryURI = URI.create("https://central.sonatype.com/repository/maven-snapshots/")
4848
val project = createProject()
4949

5050
configureRepositories(project, tempFolder.root)
@@ -138,7 +138,7 @@ class DependencyUtilsTest {
138138

139139
@Test
140140
fun configureRepositories_snapshotRepoHasHigherPriorityThanMavenCentral() {
141-
val repositoryURI = URI.create("https://oss.sonatype.org/content/repositories/snapshots/")
141+
val repositoryURI = URI.create("https://central.sonatype.com/repository/maven-snapshots/")
142142
val mavenCentralURI = URI.create("https://repo.maven.apache.org/maven2/")
143143
val project = createProject()
144144

scripts/releases/utils/release-utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function publishAndroidArtifactsToMaven(
7676
// -------- For stable releases, we also need to close and release the staging repository.
7777
if (
7878
exec(
79-
'./gradlew findSonatypeStagingRepository closeAndReleaseSonatypeStagingRepository',
79+
'./gradlew publishAndroidToSonatype closeAndReleaseSonatypeStagingRepository',
8080
).code
8181
) {
8282
echo(

0 commit comments

Comments
 (0)