Skip to content

Commit 3fbb34d

Browse files
authored
Bump Nitro Modules to 0.35 (#22)
1 parent 823d9e8 commit 3fbb34d

45 files changed

Lines changed: 4346 additions & 4297 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License (MIT)
1+
MIT License
22

3-
Copyright (c) 2024 Joel Arvidsson
3+
Copyright (c) 2026 Joel Arvidsson
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

android/src/main/java/com/haptics/HapticsPackage.kt

100755100644
File mode changed.

android/src/main/java/com/haptics/HybridHaptics.kt

100755100644
File mode changed.

example/Gemfile.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.7)
5-
base64
6-
nkf
7-
rexml
4+
CFPropertyList (3.0.8)
85
activesupport (7.2.3)
96
base64
107
benchmark (>= 0.3)
@@ -17,15 +14,15 @@ GEM
1714
minitest (>= 5.1)
1815
securerandom (>= 0.3)
1916
tzinfo (~> 2.0, >= 2.0.5)
20-
addressable (2.8.7)
21-
public_suffix (>= 2.0.2, < 7.0)
17+
addressable (2.8.9)
18+
public_suffix (>= 2.0.2, < 8.0)
2219
algoliasearch (1.27.5)
2320
httpclient (~> 2.8, >= 2.8.3)
2421
json (>= 1.5.1)
2522
atomos (0.1.3)
2623
base64 (0.3.0)
2724
benchmark (0.5.0)
28-
bigdecimal (3.3.1)
25+
bigdecimal (4.0.1)
2926
claide (1.1.0)
3027
cocoapods (1.15.2)
3128
addressable (~> 2.8)
@@ -66,34 +63,37 @@ GEM
6663
cocoapods-try (1.2.0)
6764
colored2 (3.1.2)
6865
concurrent-ruby (1.3.3)
69-
connection_pool (2.5.4)
66+
connection_pool (3.0.2)
7067
drb (2.2.3)
7168
escape (0.0.4)
72-
ethon (0.15.0)
69+
ethon (0.18.0)
7370
ffi (>= 1.15.0)
74-
ffi (1.17.2)
71+
logger
72+
ffi (1.17.3)
7573
fourflusher (2.3.1)
7674
fuzzy_match (2.0.4)
7775
gh_inspector (1.1.3)
7876
httpclient (2.9.0)
7977
mutex_m
80-
i18n (1.14.7)
78+
i18n (1.14.8)
8179
concurrent-ruby (~> 1.0)
82-
json (2.16.0)
80+
json (2.19.1)
8381
logger (1.7.0)
84-
minitest (5.26.1)
82+
minitest (6.0.2)
83+
drb (~> 2.0)
84+
prism (~> 1.5)
8585
molinillo (0.8.0)
8686
mutex_m (0.3.0)
8787
nanaimo (0.3.0)
8888
nap (1.1.0)
8989
netrc (0.11.0)
90-
nkf (0.2.0)
90+
prism (1.9.0)
9191
public_suffix (4.0.7)
9292
rexml (3.4.4)
9393
ruby-macho (2.5.1)
9494
securerandom (0.4.1)
95-
typhoeus (1.5.0)
96-
ethon (>= 0.9.0, < 0.16.0)
95+
typhoeus (1.6.0)
96+
ethon (>= 0.18.0)
9797
tzinfo (2.0.6)
9898
concurrent-ruby (~> 1.0)
9999
xcodeproj (1.25.1)

example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ react {
1919

2020
/* Variants */
2121
// The list of variants to that are debuggable. For those we're going to
22-
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
22+
// skip the bundling of the JS bundle and the assets. Default is "debug", "debugOptimized".
2323
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
24-
// debuggableVariants = ["liteDebug", "prodDebug"]
24+
// debuggableVariants = ["liteDebug", "liteDebugOptimized", "prodDebug", "prodDebugOptimized"]
2525

2626
/* Bundling */
2727
// A list containing the node command and its flags. Default is just 'node'.
@@ -45,7 +45,7 @@ react {
4545

4646
/* Hermes Commands */
4747
// The hermes compiler command to run. By default it is 'hermesc'
48-
hermesCommand = "$rootDir/../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
48+
hermesCommand = "$rootDir/../../node_modules/hermes-compiler/hermesc/%OS-BIN%/hermesc"
4949
//
5050
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5151
// hermesFlags = ["-O", "-output-source-map"]

example/ios/HapticsExample.xcodeproj/project.pbxproj

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
/* Begin PBXBuildFile section */
1010
0C80B921A6F3F58F76C31292 /* libPods-HapticsExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-HapticsExample.a */; };
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
12+
3501616D2CEAE0D056DC40BC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
1213
761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
1314
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
14-
CA80902A6A778D72D3536B5F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
@@ -160,7 +160,7 @@
160160
files = (
161161
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
162162
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
163-
CA80902A6A778D72D3536B5F /* PrivacyInfo.xcprivacy in Resources */,
163+
3501616D2CEAE0D056DC40BC /* PrivacyInfo.xcprivacy in Resources */,
164164
);
165165
runOnlyForDeploymentPostprocessing = 0;
166166
};
@@ -181,7 +181,7 @@
181181
);
182182
runOnlyForDeploymentPostprocessing = 0;
183183
shellPath = /bin/sh;
184-
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
184+
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"\\\"$WITH_ENVIRONMENT\\\" \\\"$REACT_NATIVE_XCODE\\\"\"\n";
185185
};
186186
00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
187187
isa = PBXShellScriptBuildPhase;
@@ -275,8 +275,10 @@
275275
);
276276
PRODUCT_BUNDLE_IDENTIFIER = com.hapticsexample;
277277
PRODUCT_NAME = HapticsExample;
278+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
278279
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
279280
SWIFT_VERSION = 5.0;
281+
TARGETED_DEVICE_FAMILY = "1,2";
280282
VERSIONING_SYSTEM = "apple-generic";
281283
};
282284
name = Debug;
@@ -302,7 +304,9 @@
302304
);
303305
PRODUCT_BUNDLE_IDENTIFIER = com.hapticsexample;
304306
PRODUCT_NAME = HapticsExample;
307+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
305308
SWIFT_VERSION = 5.0;
309+
TARGETED_DEVICE_FAMILY = "1,2";
306310
VERSIONING_SYSTEM = "apple-generic";
307311
};
308312
name = Release;
@@ -368,17 +372,23 @@
368372
);
369373
MTL_ENABLE_DEBUG_INFO = YES;
370374
ONLY_ACTIVE_ARCH = YES;
375+
OTHER_CFLAGS = (
376+
"$(inherited)",
377+
"-DRCT_REMOVE_LEGACY_ARCH=1",
378+
);
371379
OTHER_CPLUSPLUSFLAGS = (
372380
"$(OTHER_CFLAGS)",
373381
"-DFOLLY_NO_CONFIG",
374382
"-DFOLLY_MOBILE=1",
375383
"-DFOLLY_USE_LIBCPP=1",
376384
"-DFOLLY_CFG_NO_COROUTINES=1",
377385
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
386+
"-DRCT_REMOVE_LEGACY_ARCH=1",
378387
);
379388
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
380389
SDKROOT = iphoneos;
381390
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
391+
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
382392
USE_HERMES = true;
383393
};
384394
name = Debug;
@@ -436,16 +446,22 @@
436446
"\"$(inherited)\"",
437447
);
438448
MTL_ENABLE_DEBUG_INFO = NO;
449+
OTHER_CFLAGS = (
450+
"$(inherited)",
451+
"-DRCT_REMOVE_LEGACY_ARCH=1",
452+
);
439453
OTHER_CPLUSPLUSFLAGS = (
440454
"$(OTHER_CFLAGS)",
441455
"-DFOLLY_NO_CONFIG",
442456
"-DFOLLY_MOBILE=1",
443457
"-DFOLLY_USE_LIBCPP=1",
444458
"-DFOLLY_CFG_NO_COROUTINES=1",
445459
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
460+
"-DRCT_REMOVE_LEGACY_ARCH=1",
446461
);
447462
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
448463
SDKROOT = iphoneos;
464+
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
449465
USE_HERMES = true;
450466
VALIDATE_PRODUCT = YES;
451467
};

example/ios/HapticsExample/Info.plist

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,13 @@
4646
<key>UISupportedInterfaceOrientations</key>
4747
<array>
4848
<string>UIInterfaceOrientationPortrait</string>
49+
</array>
50+
<key>UISupportedInterfaceOrientations~ipad</key>
51+
<array>
4952
<string>UIInterfaceOrientationLandscapeLeft</string>
5053
<string>UIInterfaceOrientationLandscapeRight</string>
54+
<string>UIInterfaceOrientationPortrait</string>
55+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
5156
</array>
5257
<key>UIViewControllerBasedStatusBarAppearance</key>
5358
<false/>

0 commit comments

Comments
 (0)