Skip to content

Commit 1b61196

Browse files
authored
Release 2.10.0 (#3475)
* Update version in package.json * androidx backward compatibility * Gradle backward compatibility
1 parent d3395e0 commit 1b61196

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

android/build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,18 @@ boolean CLIENT_SIDE_BUILD = resolveClientSideBuild()
113113
if (CLIENT_SIDE_BUILD) {
114114
configurations.maybeCreate("default")
115115

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

122122
String parsedLocation = ""
123123
def libInstancesCount = 0
124-
pathStream.forEach(path -> {
124+
for (def path in paths) {
125125
parsedLocation += "- " + path.toString().replace("/package.json", "\n")
126126
libInstancesCount++
127-
})
127+
}
128128
if (libInstancesCount > 1) {
129129
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";
130130
throw new Exception(exceptionMessage)
@@ -656,7 +656,12 @@ dependencies {
656656
}
657657
implementation "com.facebook.react:react-native:+" // From node_modules
658658
implementation "androidx.transition:transition:1.1.0"
659-
implementation "androidx.core:core:1.7.0"
659+
if (rnMinorVersion > 66) {
660+
implementation "androidx.core:core:1.7.0"
661+
}
662+
else {
663+
implementation "androidx.core:core:1.6.0"
664+
}
660665
extractHeaders("com.facebook.fbjni:fbjni:" + FBJNI_VERSION + ":headers")
661666
extractSO("com.facebook.fbjni:fbjni:" + FBJNI_VERSION)
662667

0 commit comments

Comments
 (0)