Skip to content

Commit e4d4555

Browse files
Merge pull request #380 from OpenDTU-App/upgrade-react-native
2 parents f5dd2d3 + e13b504 commit e4d4555

File tree

20 files changed

+1571
-2216
lines changed

20 files changed

+1571
-2216
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ ruby ">= 2.6.10"
77
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
88
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
99
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

Gemfile.lock

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GEM
55
base64
66
nkf
77
rexml
8-
activesupport (6.1.7.8)
8+
activesupport (6.1.7.10)
99
concurrent-ruby (~> 1.0, >= 1.0.2)
1010
i18n (>= 1.6, < 2)
1111
minitest (>= 5.1)
@@ -17,7 +17,7 @@ GEM
1717
httpclient (~> 2.8, >= 2.8.3)
1818
json (>= 1.5.1)
1919
atomos (0.1.3)
20-
base64 (0.2.0)
20+
base64 (0.3.0)
2121
claide (1.1.0)
2222
cocoapods (1.15.2)
2323
addressable (~> 2.8)
@@ -57,26 +57,28 @@ GEM
5757
netrc (~> 0.11)
5858
cocoapods-try (1.2.0)
5959
colored2 (3.1.2)
60-
concurrent-ruby (1.3.4)
60+
concurrent-ruby (1.3.3)
6161
escape (0.0.4)
6262
ethon (0.16.0)
6363
ffi (>= 1.15.0)
64-
ffi (1.17.0)
64+
ffi (1.17.2)
6565
fourflusher (2.3.1)
6666
fuzzy_match (2.0.4)
6767
gh_inspector (1.1.3)
68-
httpclient (2.8.3)
69-
i18n (1.14.6)
68+
httpclient (2.9.0)
69+
mutex_m
70+
i18n (1.14.7)
7071
concurrent-ruby (~> 1.0)
71-
json (2.7.2)
72-
minitest (5.25.1)
72+
json (2.7.6)
73+
minitest (5.25.4)
7374
molinillo (0.8.0)
75+
mutex_m (0.3.0)
7476
nanaimo (0.3.0)
7577
nap (1.1.0)
7678
netrc (0.11.0)
7779
nkf (0.2.0)
7880
public_suffix (4.0.7)
79-
rexml (3.3.8)
81+
rexml (3.4.1)
8082
ruby-macho (2.5.1)
8183
typhoeus (1.4.1)
8284
ethon (>= 0.9.0)
@@ -97,6 +99,8 @@ PLATFORMS
9799
DEPENDENCIES
98100
activesupport (>= 6.1.7.5, != 7.1.0)
99101
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
102+
concurrent-ruby (< 1.3.4)
103+
xcodeproj (< 1.26.0)
100104

101105
RUBY VERSION
102106
ruby 2.6.10p210

android/app/src/main/java/xyz/commanderred/opendtuapp/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class MainActivity : ReactActivity() {
1616
* Returns the name of the main component registered from JavaScript. This is used to schedule
1717
* rendering of the component.
1818
*/
19-
override fun getMainComponentName(): String = "opendtu-react-native"
19+
override fun getMainComponentName(): String = "opendtureactnative"
2020

2121
/**
2222
* We override onCreate here to pass null as the savedInstanceState parameter. This is because

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
minSdkVersion = 24
55
compileSdkVersion = 35
66
targetSdkVersion = 35
7-
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.24"
7+
ndkVersion = "27.1.12297006"
8+
kotlinVersion = "2.0.21"
99
}
1010
repositories {
1111
google()

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
3535
# your application. You should enable this flag either if you want
3636
# to write custom TurboModules/Fabric components OR use libraries that
3737
# are providing them.
38-
newArchEnabled=false
38+
newArchEnabled=true
3939

4040
# Use this property to enable or disable the Hermes JS engine.
4141
# If set to false, you will be using JSC instead.

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
22
plugins { id("com.facebook.react.settings") }
33
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
4-
rootProject.name = 'opendtu-react-native'
4+
rootProject.name = 'opendtureactnative'
55
include ':app'
66
includeBuild('../node_modules/@react-native/gradle-plugin')
77

app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"name": "opendtu-react-native"
2+
"name": "opendtureactnative"
33
}

ios/Podfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ target 'opendtureactnative' do
3232
:app_path => "#{Pod::Config.instance.installation_root}/.."
3333
)
3434

35-
target 'opendtureactnativeTests' do
36-
inherit! :complete
37-
# Pods for testing
38-
end
39-
4035
post_install do |installer|
4136
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
4237
react_native_post_install(

0 commit comments

Comments
 (0)