Skip to content

Commit 94999c6

Browse files
committed
Revert "update: React Native 0.80.0"
1 parent bb2b9f6 commit 94999c6

File tree

18 files changed

+1012
-412
lines changed

18 files changed

+1012
-412
lines changed

.github/copilot-instructions.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
`iconName` is from the hugeicons website.
77

88
- No need to fix formatting related issues.
9-

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@ local/
8080

8181

8282
debug.log
83-
weather.json
84-
tsconfig.tsbuildinfo
83+
weather.json

App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ import React from 'react'
6262
import { Dimensions, SafeAreaView, useColorScheme } from 'react-native'
6363
import { GestureHandlerRootView } from 'react-native-gesture-handler'
6464
import Animated, { ZoomIn, ZoomOut } from 'react-native-reanimated'
65-
import './src/global.css'
65+
import './global.css'
6666

6767
function App(): React.JSX.Element {
6868
const scheme = useColorScheme()

android/app/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ react {
5454
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5555
// hermesFlags = ["-O", "-output-source-map"]
5656

57+
5758
/* Autolinking */
5859
autolinkLibrariesWithApp()
5960
}
@@ -105,6 +106,7 @@ android {
105106
versionCode 15
106107
versionName "1.5.1"
107108
}
109+
108110
splits {
109111
abi {
110112
reset()
@@ -142,6 +144,8 @@ android {
142144
applicationIdSuffix ".release"
143145
}
144146
}
147+
148+
145149
applicationVariants.all { variant ->
146150
variant.outputs.each { output ->
147151
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]

android/app/src/main/java/com/techtriangle/MainApplication.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
package com.rndiffapp
1+
package com.techtriangle
22

33
import android.app.Application
44
import com.facebook.react.PackageList
55
import com.facebook.react.ReactApplication
66
import com.facebook.react.ReactHost
7-
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
87
import com.facebook.react.ReactNativeHost
98
import com.facebook.react.ReactPackage
9+
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
13+
import com.facebook.soloader.SoLoader
1214

1315
class MainApplication : Application(), ReactApplication {
1416

@@ -33,6 +35,10 @@ class MainApplication : Application(), ReactApplication {
3335

3436
override fun onCreate() {
3537
super.onCreate()
36-
loadReactNative(this)
38+
SoLoader.init(this, OpenSourceMergedSoMapping)
39+
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
40+
// If you opted-in for the New Architecture, we load the native entry point for this app.
41+
load()
42+
}
3743
}
3844
}

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
compileSdkVersion = 35
66
targetSdkVersion = 35
77
ndkVersion = "27.1.12297006"
8-
kotlinVersion = "2.1.20"
8+
kotlinVersion = "2.0.21"
99
}
1010
repositories {
1111
google()
-59 Bytes
Binary file not shown.

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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.14.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
117+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
216+
org.gradle.wrapper.GradleWrapperMain \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

android/gradlew.bat

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
@REM Copyright (c) Meta Platforms, Inc. and affiliates.
2-
@REM
3-
@REM This source code is licensed under the MIT license found in the
4-
@REM LICENSE file in the root directory of this source tree.
5-
61
@rem
72
@rem Copyright 2015 the original author or authors.
83
@rem
@@ -75,11 +70,11 @@ goto fail
7570
:execute
7671
@rem Setup the command line
7772

78-
set CLASSPATH=
73+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7974

8075

8176
@rem Execute Gradle
82-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
8378

8479
:end
8580
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)