Skip to content

Commit 104fc9d

Browse files
CommanderRedYTCommanderRedYT
committed
WIP unfuck the app
1 parent ad0fb8d commit 104fc9d

7 files changed

Lines changed: 72 additions & 27 deletions

File tree

‎Gemfile.lock‎

Lines changed: 20 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,9 @@ 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)
21+
benchmark (0.4.1)
22+
bigdecimal (3.2.2)
2123
claide (1.1.0)
2224
cocoapods (1.15.2)
2325
addressable (~> 2.8)
@@ -57,26 +59,29 @@ GEM
5759
netrc (~> 0.11)
5860
cocoapods-try (1.2.0)
5961
colored2 (3.1.2)
60-
concurrent-ruby (1.3.4)
62+
concurrent-ruby (1.3.3)
6163
escape (0.0.4)
6264
ethon (0.16.0)
6365
ffi (>= 1.15.0)
64-
ffi (1.17.0)
66+
ffi (1.17.2)
6567
fourflusher (2.3.1)
6668
fuzzy_match (2.0.4)
6769
gh_inspector (1.1.3)
68-
httpclient (2.8.3)
69-
i18n (1.14.6)
70+
httpclient (2.9.0)
71+
mutex_m
72+
i18n (1.14.7)
7073
concurrent-ruby (~> 1.0)
71-
json (2.7.2)
72-
minitest (5.25.1)
74+
json (2.7.6)
75+
logger (1.7.0)
76+
minitest (5.25.4)
7377
molinillo (0.8.0)
78+
mutex_m (0.3.0)
7479
nanaimo (0.3.0)
7580
nap (1.1.0)
7681
netrc (0.11.0)
7782
nkf (0.2.0)
7883
public_suffix (4.0.7)
79-
rexml (3.3.8)
84+
rexml (3.4.1)
8085
ruby-macho (2.5.1)
8186
typhoeus (1.4.1)
8287
ethon (>= 0.9.0)
@@ -96,7 +101,13 @@ PLATFORMS
96101

97102
DEPENDENCIES
98103
activesupport (>= 6.1.7.5, != 7.1.0)
104+
benchmark
105+
bigdecimal
99106
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
107+
concurrent-ruby (< 1.3.4)
108+
logger
109+
mutex_m
110+
xcodeproj (< 1.26.0)
100111

101112
RUBY VERSION
102113
ruby 2.6.10p210

‎android/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ buildscript {
33
buildToolsVersion = "35.0.0"
44
minSdkVersion = 24
55
compileSdkVersion = 35
6+
67
targetSdkVersion = 35
78
ndkVersion = "27.1.12297006"
89
kotlinVersion = "2.1.20"

‎ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3207,7 +3207,7 @@ SPEC CHECKSUMS:
32073207
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
32083208
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
32093209
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
3210-
Yoga: daa1e4de4b971b977b23bc842aaa3e135324f1f3
3210+
Yoga: 703055a9f39562521cdb8657162dfd80f8c174c3
32113211

32123212
PODFILE CHECKSUM: 236a2187fcbe084e16792ff6d57013e36a11638e
32133213

‎ios/opendtureactnative.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,10 @@
299299
inputFileListPaths = (
300300
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks-${CONFIGURATION}-input-files.xcfilelist",
301301
);
302-
inputPaths = (
303-
);
304302
name = "[CP] Embed Pods Frameworks";
305303
outputFileListPaths = (
306304
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks-${CONFIGURATION}-output-files.xcfilelist",
307305
);
308-
outputPaths = (
309-
);
310306
runOnlyForDeploymentPostprocessing = 0;
311307
shellPath = /bin/sh;
312308
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-frameworks.sh\"\n";
@@ -361,14 +357,10 @@
361357
inputFileListPaths = (
362358
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources-${CONFIGURATION}-input-files.xcfilelist",
363359
);
364-
inputPaths = (
365-
);
366360
name = "[CP] Copy Pods Resources";
367361
outputFileListPaths = (
368362
"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources-${CONFIGURATION}-output-files.xcfilelist",
369363
);
370-
outputPaths = (
371-
);
372364
runOnlyForDeploymentPostprocessing = 0;
373365
shellPath = /bin/sh;
374366
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-opendtureactnative/Pods-opendtureactnative-resources.sh\"\n";
@@ -686,7 +678,10 @@
686678
"-DFOLLY_CFG_NO_COROUTINES=1",
687679
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
688680
);
689-
OTHER_LDFLAGS = "$(inherited) ";
681+
OTHER_LDFLAGS = (
682+
"$(inherited)",
683+
" ",
684+
);
690685
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
691686
SDKROOT = iphoneos;
692687
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -762,7 +757,10 @@
762757
"-DFOLLY_CFG_NO_COROUTINES=1",
763758
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
764759
);
765-
OTHER_LDFLAGS = "$(inherited) ";
760+
OTHER_LDFLAGS = (
761+
"$(inherited)",
762+
" ",
763+
);
766764
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
767765
SDKROOT = iphoneos;
768766
SWIFT_COMPILATION_MODE = wholemodule;

‎licenses.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
"licenseUrl": "https://github.com/react-native-masked-view/masked-view/raw/master/LICENSE",
4242
"parents": "opendtu-react-native"
4343
},
44+
"@react-native/new-app-screen@0.80.1": {
45+
"licenses": "MIT",
46+
"repository": "https://github.com/facebook/react-native",
47+
"licenseUrl": "https://github.com/facebook/react-native",
48+
"parents": "opendtu-react-native"
49+
},
4450
"@react-navigation/bottom-tabs@7.4.2": {
4551
"licenses": "MIT",
4652
"repository": "https://github.com/react-navigation/react-navigation",

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"@react-native-clipboard/clipboard": "^1.16.3",
4040
"@react-native-community/netinfo": "^11.4.1",
4141
"@react-native-masked-view/masked-view": "^0.3.2",
42+
"@react-native/new-app-screen": "0.80.1",
4243
"@react-navigation/bottom-tabs": "^7.4.2",
4344
"@react-navigation/native": "^7.1.14",
4445
"@react-navigation/native-stack": "^7.3.21",
@@ -106,7 +107,7 @@
106107
"@react-native-community/cli-platform-ios": "19.0.0",
107108
"@react-native/babel-preset": "0.80.1",
108109
"@react-native/eslint-config": "0.80.1",
109-
"@react-native/gradle-plugin": "0.80.1",
110+
"@react-native/gradle-plugin": "0.78.0",
110111
"@react-native/metro-config": "0.80.1",
111112
"@react-native/typescript-config": "0.80.1",
112113
"@testing-library/react-native": "^13.2.0",
@@ -156,7 +157,6 @@
156157
}
157158
},
158159
"resolutions": {
159-
"@react-native/gradle-plugin": "0.76.5",
160160
"use-latest-callback": "0.2.3"
161161
}
162162
}

‎yarn.lock‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4360,10 +4360,24 @@ __metadata:
43604360
languageName: node
43614361
linkType: hard
43624362

4363-
"@react-native/gradle-plugin@npm:0.76.5":
4364-
version: 0.76.5
4365-
resolution: "@react-native/gradle-plugin@npm:0.76.5"
4366-
checksum: 10/337a2a1dcca76e58463340e3de8c6d1e207a00f1b7441067f2828f67a03aba2d00d9abf3340d74d653a1eeaf60827ecd0e67bac9128dad6dceded444ea70e2ff
4363+
"@react-native/gradle-plugin@npm:0.76.2":
4364+
version: 0.76.2
4365+
resolution: "@react-native/gradle-plugin@npm:0.76.2"
4366+
checksum: 10/0f23a2684661589d1d0bff6cf96661b752798fa2d21b51a9e7c123736d609e1cfd1699f7f9900dd59554d3d84bdd17ea50e29380fa827cb74cf83a14b315112c
4367+
languageName: node
4368+
linkType: hard
4369+
4370+
"@react-native/gradle-plugin@npm:0.78.0":
4371+
version: 0.78.0
4372+
resolution: "@react-native/gradle-plugin@npm:0.78.0"
4373+
checksum: 10/8ee487980c9b995c9ea11384a336d53247f425b67c7276583a8191b0e9b090f56b6eacb06df0953e92a212313a37e8942ad2717539d3b3dd7ed36255b5ffecee
4374+
languageName: node
4375+
linkType: hard
4376+
4377+
"@react-native/gradle-plugin@npm:0.80.1":
4378+
version: 0.80.1
4379+
resolution: "@react-native/gradle-plugin@npm:0.80.1"
4380+
checksum: 10/8172e700832766d0e95417c07de4e4a97106f062d8a29791cede843d06ed8256a4fb8011ae36fbbb40d8c097bfa4b812b94296dc24c45555ee85d4661ea6b5bc
43674381
languageName: node
43684382
linkType: hard
43694383

@@ -4421,6 +4435,20 @@ __metadata:
44214435
languageName: node
44224436
linkType: hard
44234437

4438+
"@react-native/new-app-screen@npm:0.80.1":
4439+
version: 0.80.1
4440+
resolution: "@react-native/new-app-screen@npm:0.80.1"
4441+
peerDependencies:
4442+
"@types/react": ^19.0.0
4443+
react: "*"
4444+
react-native: "*"
4445+
peerDependenciesMeta:
4446+
"@types/react":
4447+
optional: true
4448+
checksum: 10/63146921654bef0a22622d411a88cc5bf457b7bfcb25ef63078fda034a104eaa932d3728cf774490a0f7c91c04bf4dc9d08b3cae8adcec414980119fd7d84ddc
4449+
languageName: node
4450+
linkType: hard
4451+
44244452
"@react-native/normalize-color@npm:*":
44254453
version: 2.1.0
44264454
resolution: "@react-native/normalize-color@npm:2.1.0"
@@ -13172,8 +13200,9 @@ __metadata:
1317213200
"@react-native-masked-view/masked-view": "npm:^0.3.2"
1317313201
"@react-native/babel-preset": "npm:0.80.1"
1317413202
"@react-native/eslint-config": "npm:0.80.1"
13175-
"@react-native/gradle-plugin": "npm:0.80.1"
13203+
"@react-native/gradle-plugin": "npm:0.78.0"
1317613204
"@react-native/metro-config": "npm:0.80.1"
13205+
"@react-native/new-app-screen": "npm:0.80.1"
1317713206
"@react-native/typescript-config": "npm:0.80.1"
1317813207
"@react-navigation/bottom-tabs": "npm:^7.4.2"
1317913208
"@react-navigation/native": "npm:^7.1.14"

0 commit comments

Comments
 (0)