diff --git a/Gemfile b/Gemfile index 2a7ce357..85d7f682 100644 --- a/Gemfile +++ b/Gemfile @@ -6,3 +6,4 @@ ruby ">= 2.6.10" # Exclude problematic versions of cocoapods and activesupport that causes build failures. gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' +gem 'xcodeproj', '< 1.26.0' diff --git a/android/app/src/main/java/com/jellify/MainApplication.kt b/android/app/src/main/java/com/jellify/MainApplication.kt index 56c5e67a..895cf71d 100644 --- a/android/app/src/main/java/com/jellify/MainApplication.kt +++ b/android/app/src/main/java/com/jellify/MainApplication.kt @@ -12,6 +12,7 @@ import com.facebook.react.ReactPackage import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost import com.facebook.react.defaults.DefaultReactNativeHost +import com.facebook.react.soloader.OpenSourceMergedSoMapping import com.facebook.soloader.SoLoader class MainApplication : Application(), ReactApplication { @@ -37,7 +38,7 @@ class MainApplication : Application(), ReactApplication { override fun onCreate() { super.onCreate() - SoLoader.init(this, false) + SoLoader.init(this, OpenSourceMergedSoMapping) if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { // If you opted-in for the New Architecture, we load the native entry point for this app. load() diff --git a/android/build.gradle b/android/build.gradle index df1ce4db..2320d03a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,9 +1,9 @@ buildscript { ext { - buildToolsVersion = "34.0.0" - minSdkVersion = 23 - compileSdkVersion = 34 - targetSdkVersion = 34 + buildToolsVersion = "35.0.0" + minSdkVersion = 24 + compileSdkVersion = 35 + targetSdkVersion = 35 ndkVersion = "26.1.10909125" kotlinVersion = "1.9.24" } diff --git a/android/gradle.properties b/android/gradle.properties index 9fb15664..5e24e3aa 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -32,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 # your application. You should enable this flag either if you want # to write custom TurboModules/Fabric components OR use libraries that # are providing them. -newArchEnabled=false +newArchEnabled=true # Use this property to enable or disable the Hermes JS engine. # If set to false, you will be using JSC instead. diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 6f7a6eb3..79eb9d00 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew index b740cf13..3569b91d 100755 --- a/android/gradlew +++ b/android/gradlew @@ -84,7 +84,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s' "$PWD") || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/package.json b/package.json index f5cb3122..1f3fc486 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "lodash": "^4.17.21", "nativewind": "4.0.36", "react": "18.3.1", - "react-native": "0.75.2", + "react-native": "0.76.6", "react-native-background-actions": "^4.0.1", "react-native-blurhash": "^2.1.0", "react-native-carplay": "^2.4.1-beta.0", @@ -52,13 +52,13 @@ "tamagui": "^1.115.5" }, "devDependencies": { - "@babel/core": "^7.20.0", - "@babel/preset-env": "^7.20.0", - "@babel/runtime": "^7.20.0", - "@react-native/babel-preset": "0.75.2", - "@react-native/eslint-config": "0.75.2", - "@react-native/metro-config": "0.75.2", - "@react-native/typescript-config": "0.75.2", + "@babel/core": "^7.25.2", + "@babel/preset-env": "^7.25.3", + "@babel/runtime": "^7.25.0", + "@react-native/babel-preset": "0.76.6", + "@react-native/eslint-config": "0.76.6", + "@react-native/metro-config": "0.76.6", + "@react-native/typescript-config": "0.76.6", "@types/lodash": "^4.17.10", "@types/react": "^18.2.6", "@types/react-native-vector-icons": "^6.4.18",