Move version constants back into modules so F-Droid can find them.

This reverts commit de9c6d44, except that the version numbers have
increased in the meantime.
This commit is contained in:
akwizgran
2021-01-11 16:43:42 +00:00
parent 5fdc7e7cc4
commit f3d068414b
3 changed files with 12 additions and 21 deletions

View File

@@ -5,14 +5,14 @@ apply plugin: 'witness'
apply from: 'witness.gradle' apply from: 'witness.gradle'
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion 30
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion '30.0.2'
defaultConfig { defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion 16
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion 29
versionCode rootProject.ext.versionCode versionCode 10213
versionName rootProject.ext.versionName versionName "1.2.13"
consumerProguardFiles 'proguard-rules.txt' consumerProguardFiles 'proguard-rules.txt'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

View File

@@ -16,14 +16,14 @@ def getStdout = { command, defaultValue ->
} }
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion 30
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion '30.0.2'
defaultConfig { defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion 16
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion 29
versionCode rootProject.ext.versionCode versionCode 10213
versionName rootProject.ext.versionName versionName "1.2.13"
applicationId "org.briarproject.briar.android" applicationId "org.briarproject.briar.android"
buildConfigField "String", "GitHash", buildConfigField "String", "GitHash",
"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\"" "\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""

View File

@@ -33,12 +33,3 @@ buildscript {
classpath files('libs/gradle-witness.jar') classpath files('libs/gradle-witness.jar')
} }
} }
project.ext {
buildToolsVersion = '30.0.2'
compileSdkVersion = 30
minSdkVersion = 16
targetSdkVersion = 29
versionCode = 10213
versionName = '1.2.13'
}