Upgrades: Android 12, Androidx-test 1.4, and RN 66 #3035

jonathanmos · 2021-10-24T13:51:12Z

Upgrades the android version to 12, androidx-test version to 1.4.0 and RN to 0.66.1.
Fixes #2899
Fixes #2817
Fixes #3033
Fixes #3034

mikehardy

I've done a couple Android12 forward ports and the exported symbols should be all that's required.
I saw a couple spacing issues which I made suggestions for, that's just nitpicks.

I will say that you may do a "minimal" forward port - if bumping all the versions is problematic - by simply adding the exported bits to AndroidManifest.xml without actually changing versions anywhere, as they are backwards compatible.

Or a middle ground would be to change the test app perhaps but not the main detox/android/build.gradle.

Although changing all of them should be fine really

Cheers!

detox/test/android/app/src/main/AndroidManifest.xml

mikehardy · 2021-10-24T16:54:54Z

Indeed, I see this in the build logs on one of the failures:

08:54:20 FAILURE: Build failed with an exception.
08:54:20 
08:54:20 * What went wrong:
08:54:20 Could not determine the dependencies of task ':detox:compileFullReleaseAidl'.
08:54:20 > Installed Build Tools revision 31.0.0 is corrupted. Remove and install again using the SDK Manager.
08:54:20

That's a known issue https://issuetracker.google.com/issues/190734097 and will show up until/unless android gradle plugin is bumped to 7+ - so it may be best/easiest to leave the version bumps alone or you'll need to also bump gradle to 7.2 and android gradle plugin to 7.0.3, but then you'll likely also need to update the test project to react-native 0.66.1 because I think react-native 0.64 at least (maybe 0.65 as well...) had problems with the new android gradle plugin.

Completely separately, CI everywhere else is failing on


09:54:17 > [email protected] test /home/jenkins/.jenkins/workspace/detox-android-64-x-pr/detox/test
09:54:17 > tsc && tslint types/*.ts
09:54:17 
09:54:17 node_modules/@types/node/child_process.d.ts(267,18): error TS2304: Cannot find name 'AbortSignal'.
09:54:17

That looks unrelated. I posted a PR that could resolve that #3036

mikehardy

Formatting issues are still present
The previous issue with build tools corrupted is gone now that you've attempted 30
However react-native 0.59 appears to tickle a native compiler bug as seen in that jenkins failure.

I will humbly submit that in order to get this through, you should propose the minimal change. just the exports. That's all that is strictly required.

scripts/ci.android.sh

detox/test/scripts/postinstall.js

...id/detox/src/full/java/com/wix/detox/reactnative/idlingresources/UIModuleIdlingResource.java

d4vidi

Brilliant work but unfortunately I must make our lives even harder in this case... Please go over my notes, kind sir!

detox/android/build.gradle

detox/android/detox/build.gradle

...id/detox/src/full/java/com/wix/detox/reactnative/idlingresources/UIModuleIdlingResource.java

detox/test/index.android.js

...id/detox/src/full/java/com/wix/detox/reactnative/idlingresources/UIModuleIdlingResource.java

# Conflicts: # README.md # detox/test/android/app/proguard-rules.pro

detox/android/detox/build.gradle

d4vidi

Almost there... @jonathanmos please review

.../src/full/java/com/wix/detox/reactnative/idlingresources/ViewCommandOperationsReflected.java

d4vidi · 2021-12-12T15:48:51Z

.../src/full/java/com/wix/detox/reactnative/idlingresources/ViewCommandOperationsReflected.java

+                String mCommand = Reflect.on(viewOperation).field(FIELD_MCOMMAND).get();
+
+                boolean isReactSwitch = mClassName.equals(REACT_SWITCH);
+                boolean hasOneRetryIncremented = numRetries == 1;


Why is this needed?

This indicates that the operation has been queued for retry, which happens when the reactSwitch operation fails in the rn66 bug

detox/test/scripts/postinstall.js

.../src/full/java/com/wix/detox/reactnative/idlingresources/ViewCommandOperationsReflected.java

d4vidi · 2021-12-15T22:40:23Z

...id/detox/src/full/java/com/wix/detox/reactnative/idlingresources/UIManagerModuleReflected.kt

-            synchronized(Reflect.on(uiViewOperationQueueInstance).field(LOCK_OPERATIONS).get())
-            {
-                Reflect.on(uiViewOperationQueueInstance)
-                    .field(FIELD_DISPATCH_RUNNABLES)


(should have been: FIELD_NON_BATCHED_OPS_LOCK)

d4vidi · 2021-12-15T22:43:52Z

@jonathanmos I took the liberty to push a commit (dbe0db4) here in order to try to proactively assist in pushing this forward towards a merge.

I addressed several domains:

Mostly styling - tried to make things more Kotlin idiomatic
A touch of architecture: made Reflected classes more tightly isolated in associated with the class they are reflecting
Found a bug 🐞 ! (see previous comment)

I hate to say this but I couldn't build and test this on my local env, so I will leave that to the CI / us tomorrow (today!)

Because rn66 had a breaking change in NativeModule

mikehardy · 2021-12-22T14:22:39Z

@jonathanmos & @d4vidi Exciting to see this merged! Fantastic to see Detox all ready for another mobile version year (with iOS15 and Android12 thoroughly handled). Amazing to me that it requires so much effort some times to handle the versions. Hopefully Android13 and iOS16 won't be so difficult :-). Cheers

d4vidi · 2021-12-22T14:34:29Z

@mikehardy Thanks for the kind words, and for being involved in the process 🙏🏻
Unfortunately, as RN have been holding back the official version 1 release since forever, from time to time a version upgrade happens to be very painful. I truly hope this would not be the case in at least a couple of versions 🤞🏻

In any case, solving the worked-around issue is being handled on a separate thread, as I'm sure you already know.

mikehardy · 2021-12-22T14:39:35Z

Yes, I've been a part of the RN release process as well, working hard on getting Xcode 13+ and Apple Silicon / M1 chips handled there, it is really fiddly to get the compile working and took quite a few iterations. Then in the end a Hermes upgrade resulted in rejected builds from Apple. Sometimes it just takes a while but the current RN67 release candidate has no show-stoppers reported after around a week of testing amongst our group of pre-release testers (finally!) and I've had successful TestFlight builds with it on M1 macs even, so maybe finally it's good to go :-). Cheers

d4vidi · 2021-12-22T14:41:54Z

Best of luck! We've been reported of the hermes issues - happy to see it's coming together nonetheless. Cheers!

asafkorem · 2021-12-23T15:50:38Z

detox/test/ios/Podfile

@@ -29,4 +29,5 @@ end

 post_install do |installer|
  react_native_post_install(installer)
+  __apply_Xcode_12_5_M1_post_install_workaround(installer)


We are not using Xcode 12.5 + M1 on our agents 🙂

This is part of the standard template, I worked so hard on that workaround 😅 - I'm not sure why 12.5+ (or 13+ now?) isn't in use in the agents? But if it is at all you will suffer immediate build failures without this workaround, and in fact there may be build failures just by including Swift, not just using 12.5+ or M1. Either way, it's part of the standard template (npx react-native init...) and will also be removed in react-native 0.68 (0.67 still requires it unfortunately...). Building on Xcode right now is a real mess basically, and I would remove that line at your peril...

Thanks for all your efforts on this upgrade Mike. I just saw the workaround details on RN. We are using Xcode 13, so it is relevant for our Xcode version. I was too quick to judge that it was relevant for v12.5 and not for the following versions (or specifically v13)..

I saw this error in one of our builds, and wondered why we need this call on our Podfile if we are not using M1 agents:

Generating Pods project -- | [!] An error occurred while processing the post-install hook of the Podfile. | | undefined method `__apply_Xcode_12_5_M1_post_install_workaround' for #<Pod::Podfile:0x00007f7f5bd58f68> | | /Users/builder/work/detox/test/ios/Podfile:32:in `block (2 levels) in from_ruby' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-core-1.10.2/lib/cocoapods-core/podfile.rb:179:in `post_install!' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:897:in `run_podfile_post_install_hook' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:885:in `block in run_podfile_post_install_hooks' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/user_interface.rb:145:in `message' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:884:in `run_podfile_post_install_hooks' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:329:in `block (2 levels) in create_and_save_projects' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer/xcode/pods_project_generator/pods_project_writer.rb:61:in `write!' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:328:in `block in create_and_save_projects' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/user_interface.rb:64:in `section' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:307:in `create_and_save_projects' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:299:in `generate_pods_project' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:178:in `integrate' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/installer.rb:166:in `install!' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/command/install.rb:52:in `run' | /Library/Ruby/Gems/2.6.0/gems/claide-1.0.3/lib/claide/command.rb:334:in `run' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/lib/cocoapods/command.rb:52:in `run' | /Library/Ruby/Gems/2.6.0/gems/cocoapods-1.10.2/bin/pod:55:in `<top (required)>' | /usr/local/bin/pod:23:in `load' | /usr/local/bin/pod:23:in `<main>'

However, when tried to remove this line, our build failed on xcodebuild command..

OK, the issue was that we are calling this method from RN0.64 build (and this method doesn't exist yet).
We'll wrap this with a version check.

Oh! Yes, that won't work :-), great catch

Upgrade to android 12

f5098fd

jonathanmos requested a review from d4vidi as a code owner October 24, 2021 13:51

mikehardy suggested changes Oct 24, 2021

View reviewed changes

detox/test/android/app/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved

detox/test/android/app/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved

mikehardy mentioned this pull request Oct 24, 2021

test(types): skipLibCheck=true during type testing #3036

Closed

2 tasks

jonathanmos added 2 commits October 27, 2021 10:27

use buildtools 30

6b8a1c8

Merge branch 'master' into android-12

0383f5c

mikehardy reviewed Oct 27, 2021

View reviewed changes

jonathanmos marked this pull request as draft October 28, 2021 08:25

Upgrade RN to 66

74af104

jonathanmos changed the title ~~Upgrade to android 12~~ Upgrade Android, Androidx-test, and RN Nov 3, 2021

jonathanmos added 2 commits November 3, 2021 16:07

fix indent

778f38e

update android sdkmanager path

66d9059

mikehardy reviewed Nov 8, 2021

View reviewed changes

scripts/ci.android.sh Show resolved Hide resolved

jonathanmos added 2 commits November 16, 2021 15:37

Add missing invalidate methods

2d7f972

Add workaround for switch issue in rn66

38a264d

d4vidi reviewed Dec 5, 2021

View reviewed changes

detox/test/scripts/postinstall.js Show resolved Hide resolved

d4vidi reviewed Dec 5, 2021

View reviewed changes

...id/detox/src/full/java/com/wix/detox/reactnative/idlingresources/UIModuleIdlingResource.java Outdated Show resolved Hide resolved

jonathanmos marked this pull request as ready for review December 5, 2021 15:28

jonathanmos requested review from asafkorem and noomorph as code owners December 5, 2021 15:28

d4vidi mentioned this pull request Dec 7, 2021

Upgrade to RN 0.66 (Android) #3033

Closed

4 tasks

d4vidi changed the title ~~Upgrade Android, Androidx-test, and RN~~ Upgrades: Android 12, Androidx-test 1.4, and RN 66 Dec 7, 2021

d4vidi requested changes Dec 7, 2021

View reviewed changes

jonathanmos added 6 commits December 8, 2021 15:33

Remove disableYellowBox

f1ab564

Refactor RN66 workaround to a different class

91821de

Only identify as stuck queue if seen more than x times

3b83591

Replace comments with because

5589166

Upgrade support table

6a41fdd

Merge branch 'master' into android-12

1e25263

# Conflicts: # README.md # detox/test/android/app/proguard-rules.pro

jonathanmos added 3 commits December 9, 2021 11:15

misc

c5b97b0

Add missing workaround script for ios

8452aef

exclude seems no longer needed

037796a

d4vidi reviewed Dec 12, 2021

View reviewed changes

detox/android/detox/build.gradle Show resolved Hide resolved

d4vidi requested changes Dec 12, 2021

View reviewed changes

d4vidi reviewed Dec 12, 2021

View reviewed changes

.../src/full/java/com/wix/detox/reactnative/idlingresources/ViewCommandOperationsReflected.java Outdated Show resolved Hide resolved

jonathanmos and others added 4 commits December 14, 2021 11:41

Add comments to rn66 workaround script

9374ade

Refactor reflection operations

584eeec

improve exceptions

5469a89

Improve styling, arch, potential bugs

dbe0db4

d4vidi reviewed Dec 15, 2021

View reviewed changes

jonathanmos added 2 commits December 19, 2021 10:03

Revert remove compileOptions

c094b18

Restrict android unit tests to 66 and up

3d1b34b

Because rn66 had a breaking change in NativeModule

MuckT mentioned this pull request Dec 20, 2021

Upgrade React Native version valora-inc/wallet#1145

Closed

3 tasks

d4vidi approved these changes Dec 21, 2021

View reviewed changes

jonathanmos added 3 commits December 21, 2021 17:57

Upgrade dokka to 1.6.0

067f40a

update tools path

a6ba7b2

Fix rninfo

dcfc1c7

jonathanmos merged commit 2b83c86 into master Dec 22, 2021

jonathanmos deleted the android-12 branch December 22, 2021 08:24

asafkorem reviewed Dec 23, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrades: Android 12, Androidx-test 1.4, and RN 66 #3035

Upgrades: Android 12, Androidx-test 1.4, and RN 66 #3035

jonathanmos commented Oct 24, 2021 •

edited

Loading

mikehardy left a comment

mikehardy commented Oct 24, 2021

mikehardy left a comment

d4vidi left a comment

d4vidi left a comment

d4vidi Dec 12, 2021

jonathanmos Dec 14, 2021

d4vidi Dec 15, 2021

d4vidi commented Dec 15, 2021 •

edited

Loading

mikehardy commented Dec 22, 2021

d4vidi commented Dec 22, 2021

mikehardy commented Dec 22, 2021

d4vidi commented Dec 22, 2021

asafkorem Dec 23, 2021 •

edited

Loading

mikehardy Dec 23, 2021 •

edited

Loading

asafkorem Dec 23, 2021

asafkorem Dec 26, 2021 •

edited

Loading

mikehardy Dec 28, 2021

Upgrades: Android 12, Androidx-test 1.4, and RN 66 #3035

Upgrades: Android 12, Androidx-test 1.4, and RN 66 #3035

Conversation

jonathanmos commented Oct 24, 2021 • edited Loading

mikehardy left a comment

Choose a reason for hiding this comment

mikehardy commented Oct 24, 2021

mikehardy left a comment

Choose a reason for hiding this comment

d4vidi left a comment

Choose a reason for hiding this comment

d4vidi left a comment

Choose a reason for hiding this comment

d4vidi Dec 12, 2021

Choose a reason for hiding this comment

jonathanmos Dec 14, 2021

Choose a reason for hiding this comment

d4vidi Dec 15, 2021

Choose a reason for hiding this comment

d4vidi commented Dec 15, 2021 • edited Loading

mikehardy commented Dec 22, 2021

d4vidi commented Dec 22, 2021

mikehardy commented Dec 22, 2021

d4vidi commented Dec 22, 2021

asafkorem Dec 23, 2021 • edited Loading

Choose a reason for hiding this comment

mikehardy Dec 23, 2021 • edited Loading

Choose a reason for hiding this comment

asafkorem Dec 23, 2021

Choose a reason for hiding this comment

asafkorem Dec 26, 2021 • edited Loading

Choose a reason for hiding this comment

mikehardy Dec 28, 2021

Choose a reason for hiding this comment

jonathanmos commented Oct 24, 2021 •

edited

Loading

d4vidi commented Dec 15, 2021 •

edited

Loading

asafkorem Dec 23, 2021 •

edited

Loading

mikehardy Dec 23, 2021 •

edited

Loading

asafkorem Dec 26, 2021 •

edited

Loading