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

Fix dependencies

Browse source
This commit is contained in:
Alexey Pelykh 2015-01-24 18:22:46 +02:00
parent 93304c38b7
commit 9e31ec02b2
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
OsmAnd/build.gradle
View file

@ -49,7 +49,7 @@ android {
targetSdkVersion 21
versionCode System.getenv("APK_NUMBER_VERSION")? System.getenv("APK_NUMBER_VERSION").toInteger(): versionCode
versionName System.getenv("APK_VERSION") ?: versionName
versionName System.getenv("APK_VERSION") ?: versionName
}
lintOptions {
@ -101,7 +101,7 @@ android {
}
}
flavorDimensions "version", "abi", "coreversion"
flavorDimensions "version", "coreversion", "abi"
productFlavors {
// ABI
armv7 {
@ -142,6 +142,7 @@ android {
applicationId "net.osmand.plus"
}
// CoreVersion
legacy {
flavorDimension "coreversion"
}
@ -149,7 +150,6 @@ android {
qtcore {
flavorDimension "coreversion"
}
}
buildTypes {
@ -162,11 +162,9 @@ android {
release {
signingConfig signingConfigs.publishing
}
}
}
def replaceNoTranslate(line) {
if(line.contains("\"app_name\"") && System.getenv("APP_NAME")) {
return line.replaceAll(">[^<]*<", " >"+System.getenv("APP_NAME")+"<")
@ -219,7 +217,6 @@ task collectRoutingResources(type: Sync) {
include "*.xml"
}
task collectMiscResources(type: Copy) {
into "src/net/osmand/osm"
from("../../resources/obf_creation") {
@ -236,21 +233,18 @@ task collectRenderingStylesResources(type: Sync) {
include "*.xml"
}
task collectRegionsInfoResources(type: Copy) {
from "../../resources/countries-info"
into "src/net/osmand/map"
include "regions.ocbf"
}
task copyStyleIcons(type: Copy) {
from "../../resources/rendering_styles/style-icons/"
into "res/"
include "**/*.png"
}
task collectExternalResources << {}
collectExternalResources.dependsOn collectVoiceAssets,
collectSpecialPhrasesAssets,
@ -261,16 +255,9 @@ collectExternalResources.dependsOn collectVoiceAssets,
collectMiscResources,
copyStyleIcons,
updateNoTranslate
tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn << collectExternalResources
}
task downloadAAR {
def f = new File("libs/OsmAndCore_wrapper.jar")
if (!f.exists()) {
new URL("http://builder.osmand.net:81/binaries/android/OsmAndCore_wrapper.jar").withInputStream{ i -> f.withOutputStream{ it << i }}
tasks.whenTaskAdded { task ->
if (task.name.startsWith("generate") && task.name.endsWith("Resources")) {
task.dependsOn collectExternalResources
}
}
@ -301,11 +288,7 @@ task cleanupDuplicatesInCore() {
}
}
tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn << [buildOsmAndCore, downloadAAR, cleanupDuplicatesInCore]
}
tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn << [buildOsmAndCore, downloadAAR]
compileTask -> compileTask.dependsOn << [buildOsmAndCore, cleanupDuplicatesInCore]
}
repositories {
@ -319,10 +302,10 @@ repositories {
}
dependencies {
compile fileTree(dir: "libs", include: ["*.jar"], exclude: ["QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar", "android-support*.jar", "OsmAndCore_wrapper.jar"])
compile fileTree(dir: "libs", include: ["*.jar"], exclude: ["QtAndroid-bundled.jar", "QtAndroidAccessibility-bundled.jar", "android-support*.jar"])
compile 'com.android.support:appcompat-v7:21.0.3'
qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
legacyCompile fileTree(dir: "libs", include: ["OsmAndCore_wrapper.jar"])
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"
}