Skip to content

Commit ae3114a

Browse files
j-piaseckitomekzaw
andauthored
Update Example app to React Native 0.76 (#549)
Co-authored-by: Tomek Zawadzki <tomekzawadzki98@gmail.com>
1 parent 149b3ee commit ae3114a

File tree

11 files changed

+1913
-779
lines changed

11 files changed

+1913
-779
lines changed

example/Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ ruby ">= 2.6.10"
66
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
77
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
88
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'

example/Gemfile.lock

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ PLATFORMS
106106
DEPENDENCIES
107107
activesupport (>= 6.1.7.5, != 7.1.0)
108108
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
109+
xcodeproj (< 1.26.0)
109110

110111
RUBY VERSION
111112
ruby 3.2.1p31

example/android/app/src/main/java/com/expensify/livemarkdownexample/MainApplication.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import com.facebook.react.ReactPackage
99
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1010
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1111
import com.facebook.react.defaults.DefaultReactNativeHost
12+
import com.facebook.react.soloader.OpenSourceMergedSoMapping
13+
1214
import com.facebook.soloader.SoLoader
1315

1416
class MainApplication : Application(), ReactApplication {
@@ -34,7 +36,7 @@ class MainApplication : Application(), ReactApplication {
3436

3537
override fun onCreate() {
3638
super.onCreate()
37-
SoLoader.init(this, false)
39+
SoLoader.init(this, OpenSourceMergedSoMapping)
3840
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
3941
// If you opted-in for the New Architecture, we load the native entry point for this app.
4042
load()

example/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 23
5-
compileSdkVersion = 34
3+
buildToolsVersion = "35.0.0"
4+
minSdkVersion = 24
5+
compileSdkVersion = 35
66
targetSdkVersion = 34
77
ndkVersion = "26.1.10909125"
88
kotlinVersion = "1.9.24"

example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

example/android/gradlew

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

example/android/gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

0 commit comments

Comments
 (0)