Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 2.10.0 #3475

Merged
merged 4 commits into from Aug 19, 2022
Merged

Release 2.10.0 #3475

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c72a8aa
Update version in package.json
piaskowyk Aug 13, 2022
1349f87
Merge branch 'Reanimated2' into @piaskowyk/2.10.0
piaskowyk Aug 19, 2022
0606923
androidx backward compatibility
piaskowyk Aug 19, 2022
eef90a4
Gradle backward compatibility
piaskowyk Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions android/build.gradle
View file
Open in desktop
Expand Up @@ -113,18 +113,18 @@ boolean CLIENT_SIDE_BUILD = resolveClientSideBuild()
if (CLIENT_SIDE_BUILD) {
configurations.maybeCreate("default")

Stream<Path> pathStream = Files.find(
List<Path> paths = Files.find(
Paths.get(rootDir.parent),
Integer.MAX_VALUE,
(path, basicFileAttributes) -> { path.toString().endsWith("/react-native-reanimated/package.json") }
)
{path, fileAttributes -> path.toString().endsWith("/react-native-reanimated/package.json") }
).toArray()

String parsedLocation = ""
def libInstancesCount = 0
pathStream.forEach(path -> {
for (def path in paths) {
parsedLocation += "- " + path.toString().replace("/package.json", "\n")
libInstancesCount++
})
}
if (libInstancesCount > 1) {
String exceptionMessage = "\nMultiple versions of Reanimated were detected. Only one instance of react-native-reanimated can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/troubleshooting#multiple-versions-of-reanimated-were-detected \n\nConflict between: \n" + parsedLocation + "\n";
throw new Exception(exceptionMessage)
Expand Down Expand Up @@ -656,7 +656,12 @@ dependencies {
}
implementation "com.facebook.react:react-native:+" // From node_modules
implementation "androidx.transition:transition:1.1.0"
implementation "androidx.core:core:1.7.0"
if (rnMinorVersion > 66) {
implementation "androidx.core:core:1.7.0"
}
else {
implementation "androidx.core:core:1.6.0"
}
extractHeaders("com.facebook.fbjni:fbjni:" + FBJNI_VERSION + ":headers")
extractSO("com.facebook.fbjni:fbjni:" + FBJNI_VERSION)

Expand Down