Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
4f2a40d
feat: update codebase
WoLewicki Feb 27, 2024
ac05330
chore: bump to rc1
WoLewicki Mar 1, 2024
76032a7
feat: all changes at once
WoLewicki Mar 1, 2024
2414a5b
feat: compat with old arch and 73
WoLewicki Mar 1, 2024
03ab7db
fix: use nativeState only if it is already available
WoLewicki Mar 1, 2024
2934057
restore proper code on Android
WoLewicki Mar 5, 2024
7276085
fix: inline fabric check
WoLewicki Mar 11, 2024
9f784d8
restore migrated libs to example and make ts work
WoLewicki Mar 11, 2024
043f74e
fix: quick fix for scrollviews
WoLewicki Mar 11, 2024
e5a24cf
chore: merge current main
WoLewicki Mar 11, 2024
4725d56
feat: merge changes from other PRs
WoLewicki Mar 19, 2024
d28993e
Fixes for Reanimated with Bridgeless (#5807)
tjzel Mar 20, 2024
3f8669c
still some screens issue on andrewid
tjzel Mar 20, 2024
a547079
WIP
tjzel Mar 21, 2024
4b6e3e5
isBridgeless
tjzel Mar 21, 2024
2e854ec
Merge branch '@tjzel/0.74' into @wolewicki/bridgeless-mode-with-runti…
tjzel Mar 21, 2024
4e3405f
fix iOS double event
tjzel Mar 24, 2024
194b99e
Merge branch '@tjzel/wolewosvgpls' into @tjzel/0.74
tjzel Mar 24, 2024
bd51be5
remove accidentally pulled changes from bridgeless
tjzel Mar 25, 2024
9fa93a1
mergele main
tjzel Mar 25, 2024
076c74f
init
tjzel Mar 25, 2024
ad4e27c
Merge branch '@tjzel/app-for-0.74' into @tjzel/0.74
tjzel Mar 25, 2024
8a0eb52
review changes
tjzel Mar 25, 2024
eb8790b
latest
tjzel Mar 25, 2024
b472251
many change
tjzel Mar 25, 2024
db03e9d
button
tjzel Mar 25, 2024
c8a1a1f
Merge branch '@tjzel/app-for-0.74' into @tjzel/0.74
tjzel Mar 25, 2024
2cd0b4a
init
tjzel Mar 26, 2024
f38b7f1
fix web example CI
tjzel Mar 26, 2024
c653371
fix andrewid"
tjzel Mar 26, 2024
0e11a89
Merge branch '@tjzel/app-for-0.74' into @tjzel/0.74
tjzel Mar 26, 2024
0ab8b88
Merge branch '@tjzel/0.74' into @tjzel/bump-Examples-to-0.74
tjzel Mar 26, 2024
c76e29e
fix andrewid for good"
tjzel Mar 26, 2024
6eb7db1
fix andrewid for good"
tjzel Mar 26, 2024
82b9c94
mergele
tjzel Mar 26, 2024
a51c0f7
review changes
tjzel Mar 26, 2024
c2f84b3
downstream merge
tjzel Mar 26, 2024
1b43db3
use strict
tjzel Mar 26, 2024
527a41a
Merge branch '@tjzel/0.74' into @tjzel/bump-Examples-to-0.74
tjzel Mar 26, 2024
6e92314
fix react test renderer
tjzel Mar 26, 2024
d536ec0
fix gradle
tjzel Mar 26, 2024
f768047
piker piker
tjzel Mar 26, 2024
88f5a06
review changes for examples
tjzel Mar 26, 2024
eb07f32
yarn.lock
tjzel Mar 26, 2024
489d4ab
Merge branch '@tjzel/app-for-0.74' into @tjzel/0.74
tjzel Mar 26, 2024
2033e35
Merge branch '@tjzel/0.74' into @tjzel/bump-Examples-to-0.74
tjzel Mar 26, 2024
018bd0d
cleanup in android sources
tjzel Mar 26, 2024
2f2bfa8
format
tjzel Mar 26, 2024
3216a86
Merge branch '@tjzel/0.74' into @tjzel/bump-Examples-to-0.74
tjzel Mar 26, 2024
d52773e
Replace var with standard types
piaskowyk Mar 26, 2024
17d64b8
remove patches older than 0.71 for android
tjzel Mar 27, 2024
7a23bcc
allow for nativeTag=0
tjzel Mar 27, 2024
bfb6e64
Merge branch '@tjzel/0.74' into @tjzel/bump-Examples-to-0.74
tjzel Mar 27, 2024
69fdde9
cursor and gitattributoes
tjzel Mar 27, 2024
62b4af2
mergele main
tjzel Mar 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
ios/.xcode.env.local
**/.xcode.env.local

# Android/IntelliJ
#
Expand Down Expand Up @@ -56,11 +56,12 @@ yarn-error.log
*.jsbundle

# Ruby / CocoaPods
/ios/Pods/
**/Pods/
/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# testing
/coverage

20 changes: 11 additions & 9 deletions Example/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (6.1.7.7)
activesupport (7.0.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
claide (1.1.0)
cocoapods (1.14.3)
addressable (~> 2.8)
Expand Down Expand Up @@ -63,29 +65,29 @@ GEM
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
json (2.7.1)
minitest (5.22.2)
minitest (5.22.3)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.2.6)
ruby-macho (2.5.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.23.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.6.13)

PLATFORMS
ruby
Expand All @@ -95,7 +97,7 @@ DEPENDENCIES
cocoapods (>= 1.13, < 1.15)

RUBY VERSION
ruby 3.2.1p31
ruby 3.2.2p53

BUNDLED WITH
2.3.24
2.4.15
1 change: 0 additions & 1 deletion Example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
implementation("com.facebook.react:flipper-integration")

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ 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.flipper.ReactNativeFlipper
import com.facebook.soloader.SoLoader

class MainApplication : Application(), ReactApplication {
Expand All @@ -31,7 +30,7 @@ class MainApplication : Application(), ReactApplication {
}

override val reactHost: ReactHost
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
get() = getDefaultReactHost(applicationContext, reactNativeHost)

override fun onCreate() {
super.onCreate()
Expand All @@ -40,6 +39,5 @@ class MainApplication : Application(), ReactApplication {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
>

<selector>
<!--
Expand Down
6 changes: 3 additions & 3 deletions Example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext {
buildToolsVersion = "34.0.0"
minSdkVersion = 21
minSdkVersion = 23
compileSdkVersion = 34
targetSdkVersion = 34
ndkVersion = "25.1.8937393"
kotlinVersion = "1.8.0"
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.22"
}
repositories {
google()
Expand Down
Binary file modified Example/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion Example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 7 additions & 7 deletions Example/android/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Example/android/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/app.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "ReanimatedExample",
"displayName": "ReanimatedExample"
}
}
20 changes: 3 additions & 17 deletions Example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,11 @@ require Pod::Executable.execute_command('node', ['-p',
)', __dir__]).strip

ENV['REANIMATED_EXAMPLE_APP_NAME'] = 'Example'
ENV['RCT_NEW_ARCH_ENABLED'] = '0'

platform :ios, min_ios_version_supported
prepare_react_native_project!

# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
#
# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
# ```js
# module.exports = {
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
Expand All @@ -32,11 +22,6 @@ target 'ReanimatedExample' do

use_react_native!(
:path => config[:reactNativePath],
# Enables Flipper.
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
:flipper_configuration => flipper_config,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
Expand All @@ -51,7 +36,8 @@ target 'ReanimatedExample' do
react_native_post_install(
installer,
config[:reactNativePath],
:mac_catalyst_enabled => false
:mac_catalyst_enabled => false,
# :ccache_enabled => true
)
end
end
Loading