Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use versionName assignement link we had it before gradle

Browse source
This commit is contained in:
sonora 2015-01-26 11:46:09 +01:00
parent a6ad7ca4d5
commit 0363cf5aae
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/build.gradle
View file

@ -48,7 +48,8 @@ android {
targetSdkVersion 21 targetSdkVersion 21
versionCode System.getenv("APK_NUMBER_VERSION")? System.getenv("APK_NUMBER_VERSION").toInteger(): versionCode versionCode System.getenv("APK_NUMBER_VERSION")? System.getenv("APK_NUMBER_VERSION").toInteger(): versionCode
versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName //versionName already assigned in code
//versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
} }
lintOptions { lintOptions {
@ -149,16 +150,15 @@ android {
qtcore { qtcore {
flavorDimension "coreversion" flavorDimension "coreversion"
} }
qtcoredebug {
flavorDimension "coreversion"
}
} }
buildTypes { buildTypes {
debug { debug {
signingConfig signingConfigs.development signingConfig signingConfigs.development
} }
nativeDebug {
signingConfig signingConfigs.development
}
release { release {
signingConfig signingConfigs.publishing signingConfig signingConfigs.publishing
} }
@ -183,10 +183,6 @@ def replaceNoTranslate(line) {
} }
task updateNoTranslate(type: Copy) { task updateNoTranslate(type: Copy) {
inputs.property 'appName', System.getenv().get("APP_NAME")
inputs.property 'appEdition', System.getenv().get("APP_EDITION")
inputs.property 'appFeatures', System.getenv().get("APP_FEATURES")
inputs.property 'apkVersion', System.getenv().get("APK_VERSION")
from('.') { from('.') {
include 'no_translate.xml' include 'no_translate.xml'
filter { filter {
@ -302,7 +298,7 @@ tasks.withType(JavaCompile) {
repositories { repositories {
ivy { ivy {
name = "OsmAndBinariesIvy" name = "OsmAndBinariesIvy"
url = "http://builder.osmand.net" url = "http://builder.osmand.net:81"
layout "pattern" , { layout "pattern" , {
artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
} }
@ -313,9 +309,8 @@ dependencies {
compile fileTree(dir: "libs", include: ["*.jar"], exclude: ["QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar", "android-support*.jar", "OsmAndCore_android.jar", compile fileTree(dir: "libs", include: ["*.jar"], exclude: ["QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar", "android-support*.jar", "OsmAndCore_android.jar",
"OsmAndCore_wrapper.jar"]) "OsmAndCore_wrapper.jar"])
compile 'com.android.support:appcompat-v7:21.0.3' compile 'com.android.support:appcompat-v7:21.0.3'
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" // not a debug ?
qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
//nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
//releaseCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
} }