From ee3c374fa105dd0fdc6ffbdd9ec0dc65967cddc2 Mon Sep 17 00:00:00 2001 From: Alan Lee Date: Tue, 19 Nov 2024 17:20:01 -0800 Subject: [PATCH 1/3] Remove NewAppScreen from public API test (#47707) Summary: NewAppScreen should be removed from public API test Changelog: [Internal] Differential Revision: D66165484 --- .../__snapshots__/public-api-test.js.snap | 43 ------------------- .../Libraries/__tests__/public-api-test.js | 1 + 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap index 3a13fdd06661..dec9f0e95fb8 100644 --- a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap +++ b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap @@ -6903,49 +6903,6 @@ exports[`public API should not change unintentionally Libraries/Network/fetch.js " `; -exports[`public API should not change unintentionally Libraries/NewAppScreen/components/Colors.js 1`] = ` -"declare export default { - primary: \\"#1292B4\\", - white: \\"#FFF\\", - lighter: \\"#F3F3F3\\", - light: \\"#DAE1E7\\", - dark: \\"#444\\", - darker: \\"#222\\", - black: \\"#000\\", -}; -" -`; - -exports[`public API should not change unintentionally Libraries/NewAppScreen/components/DebugInstructions.js 1`] = ` -"declare const DebugInstructions: () => Node; -declare export default typeof DebugInstructions; -" -`; - -exports[`public API should not change unintentionally Libraries/NewAppScreen/components/Header.js 1`] = ` -"declare const Header: () => Node; -declare export default typeof Header; -" -`; - -exports[`public API should not change unintentionally Libraries/NewAppScreen/components/HermesBadge.js 1`] = ` -"declare const HermesBadge: () => Node; -declare export default typeof HermesBadge; -" -`; - -exports[`public API should not change unintentionally Libraries/NewAppScreen/components/LearnMoreLinks.js 1`] = ` -"declare const LinkList: () => Node; -declare export default typeof LinkList; -" -`; - -exports[`public API should not change unintentionally Libraries/NewAppScreen/components/ReloadInstructions.js 1`] = ` -"declare const ReloadInstructions: () => Node; -declare export default typeof ReloadInstructions; -" -`; - exports[`public API should not change unintentionally Libraries/NewAppScreen/index.js 1`] = ` "export { Colors, diff --git a/packages/react-native/Libraries/__tests__/public-api-test.js b/packages/react-native/Libraries/__tests__/public-api-test.js index e9a499b70980..ebc674e686fb 100644 --- a/packages/react-native/Libraries/__tests__/public-api-test.js +++ b/packages/react-native/Libraries/__tests__/public-api-test.js @@ -26,6 +26,7 @@ const IGNORE_PATTERNS = [ '**/*.fb.js', '**/*.macos.js', '**/*.windows.js', + 'Libraries/NewAppScreen/components/**', // Non source files 'Libraries/Renderer/implementations/**', 'Libraries/Renderer/shims/**', From e3fec84d6e9dddce88b29a688925c297d9664414 Mon Sep 17 00:00:00 2001 From: Alan Lee Date: Tue, 19 Nov 2024 17:20:01 -0800 Subject: [PATCH 2/3] Align HermesBadge to bottom to avoid overlap with status bar (#47734) Summary: - With forced edge-to-edge on Android 15 targetSdk 35, `HermesBadge` overlaps with the top status bar. - Move the location of the HermesBadge to align with bottom of the header so we can avoid UI overlap with minimal changes to the template. Changelog: [Internal] Differential Revision: D66183918 --- .../Libraries/NewAppScreen/components/HermesBadge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/Libraries/NewAppScreen/components/HermesBadge.js b/packages/react-native/Libraries/NewAppScreen/components/HermesBadge.js index 8522aebd2c97..0d2a8dea5957 100644 --- a/packages/react-native/Libraries/NewAppScreen/components/HermesBadge.js +++ b/packages/react-native/Libraries/NewAppScreen/components/HermesBadge.js @@ -40,8 +40,8 @@ const HermesBadge = (): Node => { const styles = StyleSheet.create({ badge: { position: 'absolute', - top: 8, right: 12, + bottom: 8, }, badgeText: { fontSize: 14, From b3337fb88d1e75d0cb077edfa57eacbf03432524 Mon Sep 17 00:00:00 2001 From: Alan Lee Date: Tue, 19 Nov 2024 17:20:01 -0800 Subject: [PATCH 3/3] update targetSdk to 35 Summary: - updating targetSdk to 35 for RN Android and helloworld - **Note:** `tagetSdk` of RN Android does not have effect on the app's targetSdk. App can set `targetSdk` regardless of what RN targetSdk is. Updating the targetSdk just signals that RN Android has been tested with targetSdk 35 and apps can choose to support lower targetSdk as needed. Changelog: [Android][Changed] updating targetSdk to 35 (apps can still choose their own targetSdk regardless of RN version) Differential Revision: D66209381 --- packages/helloworld/android/build.gradle | 2 +- packages/react-native/ReactAndroid/src/main/AndroidManifest.xml | 2 +- packages/react-native/gradle/libs.versions.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/helloworld/android/build.gradle b/packages/helloworld/android/build.gradle index 45ad5c70a1a2..8e60949acf7f 100644 --- a/packages/helloworld/android/build.gradle +++ b/packages/helloworld/android/build.gradle @@ -10,7 +10,7 @@ buildscript { buildToolsVersion = "35.0.0" minSdkVersion = 24 compileSdkVersion = 35 - targetSdkVersion = 34 + targetSdkVersion = 35 ndkVersion = "27.1.12297006" kotlinVersion = "2.0.21" } diff --git a/packages/react-native/ReactAndroid/src/main/AndroidManifest.xml b/packages/react-native/ReactAndroid/src/main/AndroidManifest.xml index 59ba29b570b2..ed0ad2690d02 100644 --- a/packages/react-native/ReactAndroid/src/main/AndroidManifest.xml +++ b/packages/react-native/ReactAndroid/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ as the min SDK to lint the file.--> diff --git a/packages/react-native/gradle/libs.versions.toml b/packages/react-native/gradle/libs.versions.toml index fd993105d9d6..7d8b2eee0982 100644 --- a/packages/react-native/gradle/libs.versions.toml +++ b/packages/react-native/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # Android versions minSdk = "24" -targetSdk = "34" +targetSdk = "35" compileSdk = "35" buildTools = "35.0.0" ndkVersion = "27.1.12297006"