Skip to content

Commit 6b6460e

Browse files
committed
chore: update example app dependencies
1 parent 3291cd2 commit 6b6460e

File tree

18 files changed

+3353
-3317
lines changed

18 files changed

+3353
-3317
lines changed

example/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
33

4-
gem "cocoapods", "1.14.3"
4+
gem "cocoapods", "1.15.2"
55
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

example/android/app/build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ apply plugin: "com.facebook.react"
99

1010
react {
1111
/* Folders */
12-
// The root of your project, i.e. where "package.json" lives. Default is '..'
13-
// root = file("../")
14-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
15-
// reactNativeDir = file("../node_modules/react-native")
16-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
17-
// codegenDir = file("../node_modules/@react-native/codegen")
18-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
19-
// cliFile = file("../node_modules/react-native/cli.js")
12+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
13+
// root = file("../../")
14+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
15+
// reactNativeDir = file("../../node_modules/react-native")
16+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
17+
// codegenDir = file("../../node_modules/@react-native/codegen")
18+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
19+
// cliFile = file("../../node_modules/react-native/cli.js")
2020
/* Variants */
2121
// The list of variants to that are debuggable. For those we're going to
2222
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
@@ -47,6 +47,9 @@ react {
4747
//
4848
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
4949
// hermesFlags = ["-O", "-output-source-map"]
50+
51+
/* Autolinking */
52+
autolinkLibrariesWithApp()
5053
}
5154

5255
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
@@ -119,5 +122,3 @@ dependencies {
119122
implementation "com.squareup.okhttp3:okhttp:4.12.0"
120123
implementation "com.squareup.okhttp3:okhttp-urlconnection:4.12.0"
121124
}
122-
123-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

example/android/app/src/main/java/com/example/reactnativenetworkclient/MainApplication.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ 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
1213
import com.facebook.soloader.SoLoader
1314
import com.facebook.react.modules.network.OkHttpClientProvider
1415
import com.mattermost.networkclient.RCTOkHttpClientFactory
@@ -33,7 +34,7 @@ class MainApplication : Application(), ReactApplication {
3334

3435
override fun onCreate() {
3536
super.onCreate()
36-
SoLoader.init(this,false)
37+
SoLoader.init(this, OpenSourceMergedSoMapping)
3738
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
3839
// If you opted-in for the New Architecture, we load the native entry point for this app.
3940
load()

example/android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "34.0.0"
6-
minSdkVersion = 23
7-
compileSdkVersion = 34
5+
buildToolsVersion = "35.0.0"
6+
minSdkVersion = 24
7+
compileSdkVersion = 35
88
targetSdkVersion = 34
99
ndkVersion = "26.1.10909125"
10-
kotlinVersion = "1.9.22"
10+
kotlinVersion = "1.9.24"
1111
}
1212
repositories {
1313
maven {

example/android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
2121
# Android operating system, and which are packaged with your app's APK
2222
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2323
android.useAndroidX=true
24-
# Automatically convert third-party libraries to use AndroidX
25-
android.enableJetifier=true
2624

2725
# Use this property to specify which architecture you want to build.
2826
# You can also override it from the CLI using
-19.7 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
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.6-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

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/android/gradlew.bat

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/android/settings.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
2+
plugins { id("com.facebook.react.settings") }
3+
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
14
rootProject.name = 'NetworkClientExample'
2-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
35
include ':app'
46
includeBuild('../node_modules/@react-native/gradle-plugin')

0 commit comments

Comments
 (0)