Skip to content

Commit db2fe1e

Browse files
committed
try undo other half
1 parent 5497df2 commit db2fe1e

File tree

4 files changed

+16
-43
lines changed

4 files changed

+16
-43
lines changed

example/android/build.gradle

+3-20
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
buildscript {
2-
apply(from: {
3-
def searchDir = rootDir.toPath()
4-
do {
5-
def p = searchDir.resolve("node_modules/react-native-test-app/android/dependencies.gradle")
6-
if (p.toFile().exists()) {
7-
return p.toRealPath().toString()
8-
}
9-
} while (searchDir = searchDir.getParent())
10-
throw new GradleException("Could not find `react-native-test-app`");
11-
}())
2+
def androidTestAppDir = "../../node_modules/react-native-test-app/android"
3+
apply(from: "${androidTestAppDir}/dependencies.gradle")
124

135
repositories {
146
mavenCentral()
@@ -26,16 +18,7 @@ allprojects {
2618
repositories {
2719
maven {
2820
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
29-
url({
30-
def searchDir = rootDir.toPath()
31-
do {
32-
def p = searchDir.resolve("node_modules/react-native/android")
33-
if (p.toFile().exists()) {
34-
return p.toRealPath().toString()
35-
}
36-
} while (searchDir = searchDir.getParent())
37-
throw new GradleException("Could not find `react-native`");
38-
}())
21+
url("${rootDir}/../../node_modules/react-native/android")
3922
}
4023
mavenCentral()
4124
google()

example/android/gradle.properties

+12-20
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,20 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
2626
android.useAndroidX=true
2727
# Automatically convert third-party libraries to use AndroidX
2828
android.enableJetifier=true
29-
# Jetifier randomly fails on these libraries
30-
android.jetifier.ignorelist=hermes-android
31-
32-
# Use this property to specify which architecture you want to build.
33-
# You can also override it from the CLI using
34-
# ./gradlew <task> -PreactNativeArchitectures=x86_64
35-
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
36-
37-
# Use this property to enable support to the new architecture.
38-
# This will allow you to use TurboModules and the Fabric render in
39-
# your application. You should enable this flag either if you want
40-
# to write custom TurboModules/Fabric components OR use libraries that
41-
# are providing them.
29+
30+
# Version of Flipper to use with React Native. Default value is whatever React
31+
# Native defaults to. To disable Flipper, set it to `false`.
32+
FLIPPER_VERSION=false
33+
34+
# Enable Fabric at runtime.
35+
#USE_FABRIC=1
36+
37+
# Enable new architecture, i.e. Fabric + TurboModule - implies USE_FABRIC=1.
4238
# Note that this is incompatible with web debugging.
4339
#newArchEnabled=true
44-
#bridgelessEnabled=true
45-
46-
# Uncomment the line below to build React Native from source.
47-
#react.buildFromSource=true
4840

49-
# Version of Android NDK to build against.
50-
#ANDROID_NDK_VERSION=26.1.10909125
41+
# Uncomment the line below if building react-native from source
42+
#ANDROID_NDK_VERSION=21.4.7075529
5143

5244
# Version of Kotlin to build against.
53-
#KOTLIN_VERSION=1.8.22
45+
#KOTLIN_VERSION=1.7.10
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
4-
networkTimeout=10000
5-
validateDistributionUrl=true
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
75
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)