Skip to content

Commit

Permalink
[Mobile] Upgrade target sdk version to Android API 34 (#61727)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: twstokes <[email protected]>
Co-authored-by: fluiddot <[email protected]>
  • Loading branch information
4 people authored May 20, 2024
1 parent 0e0ed23 commit 608b890
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/react-native-aztec/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {

defaultConfig {
minSdkVersion 24
targetSdkVersion 33
targetSdkVersion 34
}

compileOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {

defaultConfig {
minSdkVersion 24
targetSdkVersion 33
targetSdkVersion 34
buildConfigField "boolean", "SHOULD_ATTACH_JS_BUNDLE", willPublishReactNativeBridgeBinary.toString()
}

Expand Down Expand Up @@ -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')}"
Expand Down
1 change: 1 addition & 0 deletions packages/react-native-editor/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-editor/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')}"
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down

1 comment on commit 608b890

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in 608b890.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/9155121126
📝 Reported issues:

Please sign in to comment.