Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ project.ext.react = [
]

android {
compileSdkVersion sdk.version
buildToolsVersion sdk.buildToolsVersion
compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion

// We need only set `ndkVersion` when building react-native from source.
if (hasProperty("ANDROID_NDK_VERSION")) {
Expand All @@ -81,8 +81,8 @@ android {

defaultConfig {
applicationId project.ext.react.applicationId
minSdkVersion sdk.minVersion
targetSdkVersion sdk.version
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
versionCode reactTestApp.versionCode
versionName reactTestApp.versionName

Expand Down
9 changes: 4 additions & 5 deletions android/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ ext {
versionName: "1.0"
]

sdk = [
version : 29,
minVersion : 21,
buildToolsVersion: "30.0.3"
]
compileSdkVersion = 29
buildToolsVersion = "30.0.3"
minSdkVersion = 21
targetSdkVersion = 29

/**
* Dependabot requires a `dependencies.gradle` to evaluate Java
Expand Down
8 changes: 4 additions & 4 deletions android/support/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ apply from: "$androidDir/force-resolve-trove4j.gradle"
apply plugin: "com.android.library"

android {
compileSdkVersion sdk.version
buildToolsVersion sdk.buildToolsVersion
compileSdkVersion project.ext.compileSdkVersion
buildToolsVersion project.ext.buildToolsVersion

defaultConfig {
minSdkVersion sdk.minVersion
targetSdkVersion sdk.version
minSdkVersion project.ext.minSdkVersion
targetSdkVersion project.ext.targetSdkVersion
versionCode reactTestApp.versionCode
versionName reactTestApp.versionName
}
Expand Down