Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Upgrade compile and target sdk version to Android API 31 (version 2.9.1)#21

Merged
fluiddot merged 6 commits intowp-forkfrom
update-android-12-wp-fork
Oct 18, 2022
Merged

Upgrade compile and target sdk version to Android API 31 (version 2.9.1)#21
fluiddot merged 6 commits intowp-forkfrom
update-android-12-wp-fork

Conversation

@fluiddot
Copy link
Copy Markdown

@fluiddot fluiddot commented Oct 17, 2022

Incorporate changes from #19 into version 2.9.1-wp-1.

@fluiddot
Upgrade compile and target sdk version to API 31
97a359d
@fluiddot
Bump version to wp-4
7b1512b
@fluiddot
Merge pull request #19 from wordpress-mobile/update/android-12
4810d26 
Upgrade compile and target sdk version to Android API 31
@fluiddot
Merge branch 'wp-fork' into update-android-12-wp-fork
3c1f3fc 
# Conflicts:
#	android-npm/expo/linking.gradle
#	android/build.gradle
#	package.json
#	react-native-reanimated-2.4.1-wp-4.tgz
@fluiddot
Copy link
Copy Markdown
Author

fluiddot commented Oct 17, 2022

Not sure why but when running ./createNPMPackage.sh command, it fails with the following error:

+ mv android android-temp
+ mv android-npm android
+ cp -R android/build build_output
cp: android/build: No such file or directory

However, I'm able to reproduce this same issue in wp-fork branch so not sure if generating the NPM package requires something else in version 2.9.1. @geriux any idea? Thanks!

@geriux
Copy link
Copy Markdown

geriux commented Oct 18, 2022

Hello @fluiddot 👋

After cleaning some local folders the script started to failed for me as well. I compared the code with the upstream code in 2.9.1 and there were some lines that should've been removed. It looks like there was an issue with the merge.

I created this PR that updates the script.

@fluiddot
Copy link
Copy Markdown
Author

fluiddot commented Oct 18, 2022

Hello @fluiddot 👋

After cleaning some local folders the script started to failed for me as well. I compared the code with the upstream code in 2.9.1 and there were some lines that should've been removed. It looks like there was an issue with the merge.

I created this PR that updates the script.

Great, thanks for fixing the issue 🙇 . I've just approved and merged the PR that updates the script.

@fluiddot fluiddot requested review from derekblank and geriux October 18, 2022 10:16
@fluiddot fluiddot marked this pull request as ready for review October 18, 2022 10:16
geriux
geriux approved these changes Oct 18, 2022
View reviewed changes
Copy link
Copy Markdown

@geriux geriux left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for updating this 🙇

@fluiddot fluiddot merged commit 2a8952c into wp-fork Oct 18, 2022
@fluiddot fluiddot deleted the update-android-12-wp-fork branch October 18, 2022 12:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@derekblank derekblank Awaiting requested review from derekblank

1 more reviewer

@geriux geriux geriux approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@fluiddot @geriux