From 608b8900dc7a49cf8585d3027798ee374acad87d Mon Sep 17 00:00:00 2001 From: Gerardo Pacheco Date: Mon, 20 May 2024 09:25:03 +0200 Subject: [PATCH] [Mobile] Upgrade target sdk version to Android API 34 (#61727) * Update Gutenberg targetSdkVersion to 34 * Bump third-party libraries publisher version to v6 * Update forked third-party libraries with snapshot version * Restore react-native-video and react-native-slider implementation references to the package.json * Update react-native-slider and react-native-video * Update changelog Co-authored-by: geriux Co-authored-by: twstokes Co-authored-by: fluiddot --- package-lock.json | 28 +++++++++---------- .../react-native-aztec/android/build.gradle | 2 +- .../android/react-native-bridge/build.gradle | 4 +-- packages/react-native-editor/CHANGELOG.md | 1 + .../android/app/build.gradle | 2 +- packages/react-native-editor/package.json | 4 +-- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index bba5bb915c4ab..35ea50b60b7ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10715,9 +10715,9 @@ } }, "node_modules/@react-native-community/slider": { - "version": "3.0.2-wp-4", - "resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz", - "integrity": "sha512-BrfAehlhFSUN0kzIhpeF8X4BvCJp6Rtxqfr+1Kpfn2B4kCuRmJoaqIDc+igPCl8ya99vzV1Uifw30P16NTMhuQ==", + "version": "3.0.2-wp-5", + "resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz", + "integrity": "sha512-19yl9Em1mFKFLB9o3IO3VpBFw+U7cswjRk6cZ7kkhDCpDD3u0cpzkaIZK6NuFIPCLqOwU0MPtP+gonanN1JQKw==", "workspaces": [ "src", "example" @@ -44164,9 +44164,9 @@ } }, "node_modules/react-native-video": { - "version": "5.2.0-wp-6", - "resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz", - "integrity": "sha512-3MZ9UsoagCWc5qiQzd2tG5qQbLT+PF8BXjoahEIptQ5mNPX9P4OkJOE3cyoGEDhby6ZYwWvUQNnwhhObhlP0DQ==", + "version": "5.2.0-wp-7", + "resolved": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz", + "integrity": "sha512-DTwhGwqkc3IyDWsyJe8d+cEwaw7aHBgT7Q9+X+N3zDIC7qP3bZnXuTUeag8oz9XhfxRDRQJmF+t5is3qVNIuUA==", "dependencies": { "deprecated-react-native-prop-types": "^2.2.0", "prop-types": "^15.7.2" @@ -55070,7 +55070,7 @@ "@babel/runtime": "^7.20.0", "@react-native-clipboard/clipboard": "1.11.2", "@react-native-community/blur": "4.2.0", - "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz", + "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz", "@react-native-masked-view/masked-view": "0.3.0", "@react-navigation/core": "5.12.0", "@react-navigation/native": "6.0.14", @@ -55107,7 +55107,7 @@ "react-native-screens": "3.29.0", "react-native-svg": "14.0.0", "react-native-url-polyfill": "1.3.0", - "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz", + "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz", "react-native-webview": "13.6.1" }, "engines": { @@ -63056,8 +63056,8 @@ } }, "@react-native-community/slider": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz", - "integrity": "sha512-BrfAehlhFSUN0kzIhpeF8X4BvCJp6Rtxqfr+1Kpfn2B4kCuRmJoaqIDc+igPCl8ya99vzV1Uifw30P16NTMhuQ==" + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz", + "integrity": "sha512-19yl9Em1mFKFLB9o3IO3VpBFw+U7cswjRk6cZ7kkhDCpDD3u0cpzkaIZK6NuFIPCLqOwU0MPtP+gonanN1JQKw==" }, "@react-native-masked-view/masked-view": { "version": "0.3.0", @@ -69780,7 +69780,7 @@ "@babel/runtime": "^7.20.0", "@react-native-clipboard/clipboard": "1.11.2", "@react-native-community/blur": "4.2.0", - "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz", + "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz", "@react-native-masked-view/masked-view": "0.3.0", "@react-navigation/core": "5.12.0", "@react-navigation/native": "6.0.14", @@ -69817,7 +69817,7 @@ "react-native-screens": "3.29.0", "react-native-svg": "14.0.0", "react-native-url-polyfill": "1.3.0", - "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz", + "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz", "react-native-webview": "13.6.1" }, "dependencies": { @@ -90129,8 +90129,8 @@ } }, "react-native-video": { - "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz", - "integrity": "sha512-3MZ9UsoagCWc5qiQzd2tG5qQbLT+PF8BXjoahEIptQ5mNPX9P4OkJOE3cyoGEDhby6ZYwWvUQNnwhhObhlP0DQ==", + "version": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz", + "integrity": "sha512-DTwhGwqkc3IyDWsyJe8d+cEwaw7aHBgT7Q9+X+N3zDIC7qP3bZnXuTUeag8oz9XhfxRDRQJmF+t5is3qVNIuUA==", "requires": { "deprecated-react-native-prop-types": "^2.2.0", "prop-types": "^15.7.2" diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle index 0c93a9c858e92..45312e89f0b9d 100644 --- a/packages/react-native-aztec/android/build.gradle +++ b/packages/react-native-aztec/android/build.gradle @@ -53,7 +53,7 @@ android { defaultConfig { minSdkVersion 24 - targetSdkVersion 33 + targetSdkVersion 34 } compileOptions { diff --git a/packages/react-native-bridge/android/react-native-bridge/build.gradle b/packages/react-native-bridge/android/react-native-bridge/build.gradle index 8f3fcd35a95ab..d8249b9d1b640 100644 --- a/packages/react-native-bridge/android/react-native-bridge/build.gradle +++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle @@ -39,7 +39,7 @@ android { defaultConfig { minSdkVersion 24 - targetSdkVersion 33 + targetSdkVersion 34 buildConfigField "boolean", "SHOULD_ATTACH_JS_BUNDLE", willPublishReactNativeBridgeBinary.toString() } @@ -93,7 +93,7 @@ dependencies { // Published by `wordpress-mobile/react-native-libraries-publisher` // See the documentation for this value in `build.gradle.kts` of `wordpress-mobile/react-native-libraries-publisher` - def reactNativeLibrariesPublisherVersion = "v5" + def reactNativeLibrariesPublisherVersion = "v6" def reactNativeLibrariesGroupId = "org.wordpress.react-native-libraries.$reactNativeLibrariesPublisherVersion" implementation "$reactNativeLibrariesGroupId:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}" implementation "$reactNativeLibrariesGroupId:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}" diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md index c7ae81c1bdbc7..7e3fc89ddbd6f 100644 --- a/packages/react-native-editor/CHANGELOG.md +++ b/packages/react-native-editor/CHANGELOG.md @@ -11,6 +11,7 @@ For each user feature we should also add a importance categorization label to i ## Unreleased - [internal] Remove circular dependencies within the components package [#61102] +- [internal] Upgrade target sdk version to Android API 34 [#61727] ## 1.118.0 - [*] Fix a crash when pasting file images and special comment markup [#60476] diff --git a/packages/react-native-editor/android/app/build.gradle b/packages/react-native-editor/android/app/build.gradle index 6f2ed72318b13..09da2a438eae1 100644 --- a/packages/react-native-editor/android/app/build.gradle +++ b/packages/react-native-editor/android/app/build.gradle @@ -105,7 +105,7 @@ dependencies { // Published by `wordpress-mobile/react-native-libraries-publisher` // See the documentation for this value in `build.gradle.kts` of `wordpress-mobile/react-native-libraries-publisher` - def reactNativeLibrariesPublisherVersion = "v5" + def reactNativeLibrariesPublisherVersion = "v6" def reactNativeLibrariesGroupId = "org.wordpress.react-native-libraries.$reactNativeLibrariesPublisherVersion" implementation "$reactNativeLibrariesGroupId:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}" implementation "$reactNativeLibrariesGroupId:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}" diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index a682a4ae45186..16988d1c5cbcd 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -32,7 +32,7 @@ "@babel/runtime": "^7.20.0", "@react-native-clipboard/clipboard": "1.11.2", "@react-native-community/blur": "4.2.0", - "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-4/react-native-community-slider-3.0.2-wp-4.tgz", + "@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-5/react-native-community-slider-3.0.2-wp-5.tgz", "@react-native-masked-view/masked-view": "0.3.0", "@react-navigation/core": "5.12.0", "@react-navigation/native": "6.0.14", @@ -69,7 +69,7 @@ "react-native-screens": "3.29.0", "react-native-svg": "14.0.0", "react-native-url-polyfill": "1.3.0", - "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-6/react-native-video-5.2.0-wp-6.tgz", + "react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-7/react-native-video-5.2.0-wp-7.tgz", "react-native-webview": "13.6.1" }, "publishConfig": {