chore: bump AGP version

edeckers · Jul 28, 2022 · 92a801b · 92a801b
1 parent 12b704a
commit 92a801b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -35,9 +35,7 @@ android {
   defaultConfig {
     minSdkVersion project.ext.min_sdk_version
     targetSdkVersion project.ext.target_sdk_version
-    versionCode 1
-    versionName "1.0"
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     multiDexEnabled true
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     buildConfigField "Long", "ADB_COMMAND_TIMEOUT_MILLISECONDS", ADB_COMMAND_TIMEOUT_MILLISECONDS

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -24,12 +24,8 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:7.1.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
-<<<<<<< HEAD
         classpath("de.undercouch:gradle-download-task:5.0.1")
 
-=======
-        classpath("de.undercouch:gradle-download-task:4.1.2")
->>>>>>> feat: migrate to new rn architecture
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -38,7 +34,7 @@ buildscript {
 allprojects {
     repositories {
         maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm; app and library 
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm; app and library
             // versions are allowed to differ, hence two different react-native includes
             url("$rootDir/../../node_modules/react-native/android")
         }