Skip to content

Commit d4ff8a9

Browse files
WoLewickiWoLewicki
committed
chore: bump example to rn76
1 parent 55bdd97 commit d4ff8a9

25 files changed

+6948
-9456
lines changed

‎example/.prettierrc.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
arrowParens: 'avoid',
3+
bracketSameLine: true,
4+
bracketSpacing: false,
5+
singleQuote: true,
6+
trailingComma: 'all',
7+
};

‎example/.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.6
1+
3.3.5

‎example/.watchmanconfig

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎example/.yarn/releases/yarn-3.6.4.cjs

-874
This file was deleted.

‎example/.yarnrc.yml

-3
This file was deleted.

‎example/Gemfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'

‎example/Gemfile.lock

+51-19
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,32 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (7.0.7.2)
9-
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
activesupport (7.2.2)
9+
base64
10+
benchmark (>= 0.3)
11+
bigdecimal
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
13+
connection_pool (>= 2.2.5)
14+
drb
1015
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
1117
minitest (>= 5.1)
12-
tzinfo (~> 2.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
1320
addressable (2.8.7)
1421
public_suffix (>= 2.0.2, < 7.0)
1522
algoliasearch (1.27.5)
1623
httpclient (~> 2.8, >= 2.8.3)
1724
json (>= 1.5.1)
1825
atomos (0.1.3)
1926
base64 (0.2.0)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.8)
2029
claide (1.1.0)
21-
cocoapods (1.14.3)
30+
cocoapods (1.15.2)
2231
addressable (~> 2.8)
2332
claide (>= 1.0.2, < 2.0)
24-
cocoapods-core (= 1.14.3)
33+
cocoapods-core (= 1.15.2)
2534
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2635
cocoapods-downloader (>= 2.1, < 3.0)
2736
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,7 +45,7 @@ GEM
3645
nap (~> 1.0)
3746
ruby-macho (>= 2.3.0, < 3.0)
3847
xcodeproj (>= 1.23.0, < 2.0)
39-
cocoapods-core (1.14.3)
48+
cocoapods-core (1.15.2)
4049
activesupport (>= 5.0, < 8)
4150
addressable (~> 2.8)
4251
algoliasearch (~> 1.0)
@@ -56,50 +65,73 @@ GEM
5665
netrc (~> 0.11)
5766
cocoapods-try (1.2.0)
5867
colored2 (3.1.2)
59-
concurrent-ruby (1.2.2)
68+
concurrent-ruby (1.3.4)
69+
connection_pool (2.4.1)
70+
drb (2.2.1)
6071
escape (0.0.4)
6172
ethon (0.16.0)
6273
ffi (>= 1.15.0)
63-
ffi (1.16.3)
74+
ffi (1.17.0)
75+
ffi (1.17.0-aarch64-linux-gnu)
76+
ffi (1.17.0-aarch64-linux-musl)
77+
ffi (1.17.0-arm-linux-gnu)
78+
ffi (1.17.0-arm-linux-musl)
79+
ffi (1.17.0-arm64-darwin)
80+
ffi (1.17.0-x86-linux-gnu)
81+
ffi (1.17.0-x86-linux-musl)
82+
ffi (1.17.0-x86_64-darwin)
83+
ffi (1.17.0-x86_64-linux-gnu)
84+
ffi (1.17.0-x86_64-linux-musl)
6485
fourflusher (2.3.1)
6586
fuzzy_match (2.0.4)
6687
gh_inspector (1.1.3)
6788
httpclient (2.8.3)
68-
i18n (1.14.1)
89+
i18n (1.14.6)
6990
concurrent-ruby (~> 1.0)
7091
json (2.8.2)
71-
minitest (5.19.0)
92+
logger (1.6.1)
93+
minitest (5.25.2)
7294
molinillo (0.8.0)
73-
nanaimo (0.4.0)
95+
nanaimo (0.3.0)
7496
nap (1.1.0)
7597
netrc (0.11.0)
7698
nkf (0.2.0)
7799
public_suffix (4.0.7)
78100
rexml (3.3.9)
79101
ruby-macho (2.5.1)
102+
securerandom (0.3.2)
80103
typhoeus (1.4.1)
81104
ethon (>= 0.9.0)
82105
tzinfo (2.0.6)
83106
concurrent-ruby (~> 1.0)
84-
xcodeproj (1.27.0)
107+
xcodeproj (1.25.1)
85108
CFPropertyList (>= 2.3.3, < 4.0)
86109
atomos (~> 0.1.3)
87110
claide (>= 1.0.2, < 2.0)
88111
colored2 (~> 3.1)
89-
nanaimo (~> 0.4.0)
112+
nanaimo (~> 0.3.0)
90113
rexml (>= 3.3.6, < 4.0)
91114

92115
PLATFORMS
93-
arm64-darwin-21
116+
aarch64-linux-gnu
117+
aarch64-linux-musl
118+
arm-linux-gnu
119+
arm-linux-musl
120+
arm64-darwin
94121
ruby
95-
x86_64-linux
122+
x86-linux-gnu
123+
x86-linux-musl
124+
x86_64-darwin
125+
x86_64-linux-gnu
126+
x86_64-linux-musl
96127

97128
DEPENDENCIES
98-
activesupport (>= 6.1.7.5, < 7.1.0)
99-
cocoapods (>= 1.13, < 1.15)
129+
activesupport (>= 6.1.7.5, != 7.1.0)
130+
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
131+
xcodeproj (< 1.26.0)
100132

101133
RUBY VERSION
102-
ruby 2.7.4p191
134+
ruby 3.3.5p100
103135

104136
BUNDLED WITH
105-
2.3.4
137+
2.5.16

‎example/android/app/build.gradle

+11-14
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@ apply plugin: "com.android.application"
22
apply plugin: "org.jetbrains.kotlin.android"
33
apply plugin: "com.facebook.react"
44

5-
import com.android.build.OutputFile
6-
75
/**
86
* This is the configuration block to customize your React Native Android app.
97
* By default you don't need to apply any configuration, just uncomment the lines you need.
108
*/
119
react {
1210
/* Folders */
13-
// The root of your project, i.e. where "package.json" lives. Default is '..'
14-
// root = file("../")
15-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
16-
// reactNativeDir = file("../node_modules/react-native")
17-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
18-
// codegenDir = file("../node_modules/@react-native/codegen")
19-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
20-
// cliFile = file("../node_modules/react-native/cli.js")
11+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
12+
// root = file("../../")
13+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
14+
// reactNativeDir = file("../../node_modules/react-native")
15+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
16+
// codegenDir = file("../../node_modules/@react-native/codegen")
17+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
18+
// cliFile = file("../../node_modules/react-native/cli.js")
2119

2220
/* Variants */
2321
// The list of variants to that are debuggable. For those we're going to
@@ -51,6 +49,9 @@ react {
5149
//
5250
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5351
// hermesFlags = ["-O", "-output-source-map"]
52+
53+
/* Autolinking */
54+
autolinkLibrariesWithApp()
5455
}
5556

5657
/**
@@ -73,7 +74,6 @@ def jscFlavor = 'org.webkit:android-jsc:+'
7374

7475
android {
7576
ndkVersion rootProject.ext.ndkVersion
76-
7777
buildToolsVersion rootProject.ext.buildToolsVersion
7878
compileSdk rootProject.ext.compileSdkVersion
7979

@@ -85,7 +85,6 @@ android {
8585
versionCode 1
8686
versionName "1.0"
8787
}
88-
8988
signingConfigs {
9089
debug {
9190
storeFile file('debug.keystore')
@@ -120,5 +119,3 @@ dependencies {
120119
implementation jscFlavor
121120
}
122121
}
123-
124-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

‎example/android/app/src/main/java/com/example/reactnativecamerakit/MainApplication.kt

+2-1
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

1415
import com.rncamerakit.RNCameraKitPackage
@@ -37,7 +38,7 @@ class MainApplication : Application(), ReactApplication {
3738

3839
override fun onCreate() {
3940
super.onCreate()
40-
SoLoader.init(this, false)
41+
SoLoader.init(this, OpenSourceMergedSoMapping)
4142
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
4243
// If you opted-in for the New Architecture, we load the native entry point for this app.
4344
load()

‎example/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
3+
buildToolsVersion = "35.0.0"
44
minSdkVersion = 24
5-
compileSdkVersion = 34
5+
compileSdkVersion = 35
66
targetSdkVersion = 34
77
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.22"
8+
kotlinVersion = "1.9.24"
99
}
1010
repositories {
1111
google()

‎example/android/gradle.properties

-2
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

‎example/android/gradle/wrapper/gradle-wrapper.jar

-15.9 KB
Binary file not shown.

‎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.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

+5-2
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
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -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 ##########################################################################

‎example/android/settings.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
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 = 'CameraKitExample'
2-
3-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
45
include ':app'
56
includeBuild('../node_modules/@react-native/gradle-plugin')
67

‎example/ios/CameraKitExample.xcodeproj/project.pbxproj

+9-2
Original file line numberDiff line numberDiff line change
@@ -606,9 +606,13 @@
606606
"-DFOLLY_MOBILE=1",
607607
"-DFOLLY_USE_LIBCPP=1",
608608
);
609-
OTHER_LDFLAGS = "$(inherited) ";
609+
OTHER_LDFLAGS = (
610+
"$(inherited)",
611+
" ",
612+
);
610613
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
611614
SDKROOT = iphoneos;
615+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
612616
USE_HERMES = true;
613617
};
614618
name = Debug;
@@ -676,7 +680,10 @@
676680
"-DFOLLY_MOBILE=1",
677681
"-DFOLLY_USE_LIBCPP=1",
678682
);
679-
OTHER_LDFLAGS = "$(inherited) ";
683+
OTHER_LDFLAGS = (
684+
"$(inherited)",
685+
" ",
686+
);
680687
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
681688
SDKROOT = iphoneos;
682689
USE_HERMES = true;

‎example/ios/CameraKitExample/AppDelegate.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
1818
{
1919
return [self bundleURL];
2020
}
21-
21+
2222
- (NSURL *)bundleURL
2323
{
2424
#if DEBUG

‎example/ios/CameraKitExample/Info.plist

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<true/>
2727
<key>NSAppTransportSecurity</key>
2828
<dict>
29+
<!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
2930
<key>NSAllowsArbitraryLoads</key>
3031
<false/>
3132
<key>NSAllowsLocalNetworking</key>

‎example/ios/Podfile

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ require Pod::Executable.execute_command('node', ['-p',
88
platform :ios, min_ios_version_supported
99
prepare_react_native_project!
1010

11+
ENV['RCT_NEW_ARCH_ENABLED'] = '0';
12+
1113
linkage = ENV['USE_FRAMEWORKS']
1214
if linkage != nil
1315
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green

0 commit comments

Comments
 (0)