Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'move-version-numbers-back-to-modules' into 'master'

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

See merge request briar/briar!1338
This commit is contained in:
Torsten Grote
2021-01-11 16:58:24 +00:00
parent 5fdc7e7cc4 f3d068414b
commit cb69340749
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bramble-android/build.gradle
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"

12
briar-android/build.gradle
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')}\""

9
build.gradle
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'
}