Skip to content

[FIX] Fix release 5.0.0 bad merge with 5.0.1#1690

Merged
CHaNGeTe merged 11 commits intoTheWidlarzGroup:masterfrom
24i:feature/androidx-cherry-pick
Sep 8, 2019
Merged

[FIX] Fix release 5.0.0 bad merge with 5.0.1#1690
CHaNGeTe merged 11 commits intoTheWidlarzGroup:masterfrom
24i:feature/androidx-cherry-pick

Conversation

@CHaNGeTe
Copy link
Copy Markdown
Contributor

A bad merging process occurred on release 5.0.0 (AndroidX support)
This tries to fix it.

@vokhuyetOz can you also check this PR? sorry for that

Daniel Mariño and others added 11 commits July 28, 2019 15:42
(cherry picked from commit a96fa33)
(cherry picked from commit 3ddcba3)
(cherry picked from commit 976ebcc)
(cherry picked from commit ed25b3f)
(cherry picked from commit 8a8f215)
(cherry picked from commit b0737bd)
(cherry picked from commit 2f23cc0)
@CHaNGeTe
Copy link
Copy Markdown
Contributor Author

Closes #1688

@cobarx
Copy link
Copy Markdown
Contributor

cobarx commented Jul 29, 2019

@CHaNGeTe I would recommend adding some notes to the README about the AndroidX change in 5.x and what the implications are in terms of minimum supported React Native version and support (or not) for pre-AndroidX setups. Having that data available will help prevent people opening issues about it.

@cobarx
Copy link
Copy Markdown
Contributor

cobarx commented Jul 29, 2019

@CHaNGeTe Oops looks like you just added it to the README, my bad for not checking the change list. Is it possible to use AndroidX with older React Native versions?

@vanhungoz
Copy link
Copy Markdown

@CHaNGeTe , i will try to check it in the end of today, now i am in the office. i can't check it. sorry about that. ( now it is the morning in Viet Nam )

@CHaNGeTe
Copy link
Copy Markdown
Contributor Author

CHaNGeTe commented Jul 29, 2019

@cobarx I think you need react-native >=0.60 for that. And >=0.59.1 for 64bit builds.
I think the code on react-native-video (the compat library migration) is compatible with earlier versions, but if you plan to use androidX or 64bit I think the upgrade is required.
As 64bit will be a requirement from google for publishing I assume lots of people will migrate.
Maybe @vokhuyetOz and @yozman can elaborate more on this.

@karltaylor
Copy link
Copy Markdown
Contributor

Can this be merged? 😇

@@ -18,3 +18,5 @@
# org.gradle.parallel=true

android.useDeprecatedNdk=true
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I believe android.useDeprecatedNdk is no longer supported?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

should I remove the property then?

@ashnfb
Copy link
Copy Markdown
Contributor

ashnfb commented Jul 31, 2019

@CHaNGeTe sorry I've been offline for a bit. Looks fine to merge.

Comment thread README.md Outdated
...
compile project(':react-native-video')
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+ implementation "androidx.appcompat:appcompat:1.0.0"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

the latest version is 1.0.2
androidx.appcompat:appcompat:1.0.2

@ashnfb ashnfb changed the title [FIX] Fix release 5.0.0 bard merge with 5.0.1 [FIX] Fix release 5.0.0 bad merge with 5.0.1 Jul 31, 2019

android.useDeprecatedNdk=true
android.useAndroidX=true
android.enableJetifier=true No newline at end of file
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

add line

@benjipott
Copy link
Copy Markdown

@cobarx && @n1ru4l possible to check this PR please ?

@Dzuvan
Copy link
Copy Markdown

Dzuvan commented Sep 2, 2019

Sorry to bother, I was just wondering is there any ETA for this?

@CHaNGeTe CHaNGeTe merged commit d858bf7 into TheWidlarzGroup:master Sep 8, 2019
@CHaNGeTe
Copy link
Copy Markdown
Contributor Author

CHaNGeTe commented Sep 8, 2019

released

beauner69 pushed a commit to beauner69/react-native-video that referenced this pull request Oct 10, 2019
…rry-pick

[FIX] Fix release 5.0.0 bad merge with 5.0.1

(rebased from commit d858bf7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants