diff --git a/android/app/build.gradle b/android/app/build.gradle index 1a74faac..36e231c6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -167,10 +167,7 @@ android { } packagingOptions { - pickFirst "lib/armeabi-v7a/libc++_shared.so" - pickFirst "lib/arm64-v8a/libc++_shared.so" - pickFirst "lib/x86/libc++_shared.so" - pickFirst "lib/x86_64/libc++_shared.so" + pickFirst '**/*.so' } // applicationVariants are e.g. debug, release diff --git a/android/build.gradle b/android/build.gradle index 7f648dc8..e5f33ee1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,17 +2,18 @@ buildscript { ext { - buildToolsVersion = "28.0.3" - minSdkVersion = 16 - compileSdkVersion = 28 - targetSdkVersion = 28 + buildToolsVersion = "30.0.3" + minSdkVersion = 21 + compileSdkVersion = 31 + targetSdkVersion = 31 + supportLibVersion = "30.0.0" } repositories { google() jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.5.2") + classpath('com.android.tools.build:gradle:3.6.4') // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -34,4 +35,9 @@ allprojects { jcenter() maven { url 'https://www.jitpack.io' } } + configurations.all { + resolutionStrategy { + force 'com.facebook.react:react-native:0.62.2' //select Version you used + } + } } diff --git a/android/gradle.properties b/android/gradle.properties index ae1470f5..4a9395ee 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -7,4 +7,6 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.33.1 \ No newline at end of file +FLIPPER_VERSION=0.99.0 +org.gradle.jvmargs=-Xmx2g -XX\:MaxHeapSize\=4g +org.gradle.java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8d863604..85da4285 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Nov 28 23:45:05 IST 2017 +#Sun Jan 29 21:07:39 IST 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-rc-1-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/package.json b/package.json index 7369fea2..bcb77ffd 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "lint": "eslint ." }, "dependencies": { - "@react-native-community/slider": "^4.4.1", + "@react-native-community/slider": "^3.0.3", + "jetifier": "^2.0.0", "react": "16.11.0", "react-native": "0.62.2", "react-native-sound": "^0.11.0"