File tree Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -35,9 +35,7 @@ android {
3535 defaultConfig {
3636 minSdkVersion project. ext. min_sdk_version
3737 targetSdkVersion project. ext. target_sdk_version
38- versionCode 1
39- versionName " 1.0"
40- testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
38+ testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
4139 multiDexEnabled true
4240 buildConfigField " boolean" , " IS_NEW_ARCHITECTURE_ENABLED" , isNewArchitectureEnabled(). toString()
4341 buildConfigField " Long" , " ADB_COMMAND_TIMEOUT_MILLISECONDS" , ADB_COMMAND_TIMEOUT_MILLISECONDS
Original file line number Diff line number Diff line change @@ -24,12 +24,8 @@ buildscript {
2424 dependencies {
2525 classpath(" com.android.tools.build:gradle:7.1.1" )
2626 classpath(" com.facebook.react:react-native-gradle-plugin" )
27- <<<<<< < HEAD
2827 classpath(" de.undercouch:gradle-download-task:5.0.1" )
2928
30- ====== =
31- classpath(" de.undercouch:gradle-download-task:4.1.2" )
32- >>>>>>> feat : migrate to new rn architecture
3329 // NOTE: Do not place your application dependencies here; they belong
3430 // in the individual module build.gradle files
3531 }
@@ -38,7 +34,7 @@ buildscript {
3834allprojects {
3935 repositories {
4036 maven {
41- // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm; app and library
37+ // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm; app and library
4238 // versions are allowed to differ, hence two different react-native includes
4339 url(" $rootDir /../../node_modules/react-native/android" )
4440 }
You can’t perform that action at this time.
0 commit comments