Skip to content

Commit

Permalink
Release 2.10.0 (#3475)
Browse files Browse the repository at this point in the history
* Update version in package.json

* androidx backward compatibility

* Gradle backward compatibility
  • Loading branch information
piaskowyk authored Aug 19, 2022
1 parent d3395e0 commit 1b61196
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
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

0 comments on commit 1b61196

Please sign in to comment.