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:
Victor Shcherb 2018-04-15 02:51:24 +02:00
parent 3878c63fb9
commit 62c6fc2920
6 changed files with 60 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/.gitignore vendored
View file

@ -10,6 +10,7 @@ libs/org.*.jar
libs/commons-logging-commons-logging-api-1.1.jar libs/commons-logging-commons-logging-api-1.1.jar
libs/fr.univ-valenciennes-bzip2-1.0.jar libs/fr.univ-valenciennes-bzip2-1.0.jar
libs/it.unibo.alice.tuprolog-tuprolog-3.2.1.jar libs/it.unibo.alice.tuprolog-tuprolog-3.2.1.jar
libs/commons-codec-commons-codec-1.11.jar
valgrind/ valgrind/
bin/ bin/

72
OsmAnd/build.gradle
View file

@ -22,10 +22,18 @@ apply plugin: 'com.github.ksoichiro.eclipse.aar'
def analytics = (!System.getenv("APP_FEATURES") || System.getenv("APP_FEATURES").contains("+play_market")) && def analytics = (!System.getenv("APP_FEATURES") || System.getenv("APP_FEATURES").contains("+play_market")) &&
getGradle().getStartParameter().getTaskRequests().toString().contains("Free") getGradle().getStartParameter().getTaskRequests().toString().contains("Free")
eclipseAar { eclipseAar {
// See "Configurations" for details // See "Configurations" for details
androidTarget = 'android-27' androidTarget = 'android-27'
aarDependenciesDir = 'aarDependencies' aarDependenciesDir = 'aarDependencies'
targetConfigurations = ['compile']
// cleanLibsDirectoryEnabled = true
}
task printc {
configurations.each { if(it.isCanBeResolved()) println it.name }
} }
android { android {
@ -390,47 +398,47 @@ repositories {
project.logger.warn("Analytics enabled for free version: $analytics") project.logger.warn("Analytics enabled for free version: $analytics")
dependencies { dependencies {
compile project(path: ':OsmAnd-java', configuration: 'android') implementation project(path: ':OsmAnd-java', configuration: 'android')
if (analytics) { if (analytics) {
compile 'com.google.firebase:firebase-core:12.0.1' implementation 'com.google.firebase:firebase-core:12.0.1'
compile 'com.google.firebase:firebase-messaging:12.0.1' implementation 'com.google.firebase:firebase-messaging:12.0.1'
compile 'com.google.firebase:firebase-iid:12.0.1' implementation 'com.google.firebase:firebase-iid:12.0.1'
compile 'com.google.firebase:firebase-config:12.0.1' implementation 'com.google.firebase:firebase-config:12.0.1'
compile 'com.facebook.android:facebook-android-sdk:4.31.0' implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
} }
compile 'com.android.support:multidex:1.0.1' implementation 'com.android.support:multidex:1.0.1'
compile 'com.android.support:gridlayout-v7:27.1.0' implementation 'com.android.support:gridlayout-v7:27.1.0'
compile 'com.android.support:cardview-v7:27.1.0' implementation 'com.android.support:cardview-v7:27.1.0'
compile 'com.android.support:appcompat-v7:27.1.0' implementation 'com.android.support:appcompat-v7:27.1.0'
compile 'com.android.support:design:27.1.0' implementation 'com.android.support:design:27.1.0'
compile 'com.android.support:customtabs:27.1.0' implementation 'com.android.support:customtabs:27.1.0'
compile fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs') implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
compile 'commons-logging:commons-logging-api:1.1' implementation 'commons-logging:commons-logging-api:1.1'
compile 'commons-codec:commons-codec:1.11' implementation 'commons-codec:commons-codec:1.11'
compile 'it.unibo.alice.tuprolog:tuprolog:3.2.1' implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
compile 'org.beanshell:bsh-core:2.0b4' implementation 'org.beanshell:bsh-core:2.0b4'
compile 'fr.univ-valenciennes:bzip2:1.0' implementation 'fr.univ-valenciennes:bzip2:1.0'
compile 'com.moparisthebest:junidecode:0.1.1' implementation 'com.moparisthebest:junidecode:0.1.1'
compile 'org.immutables:gson:2.5.0' implementation 'org.immutables:gson:2.5.0'
compile 'com.vividsolutions:jts-core:1.14.0' implementation 'com.vividsolutions:jts-core:1.14.0'
compile 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.picasso:picasso:2.71828'
// size restrictions // size restrictions
// compile 'com.ibm.icu:icu4j:50.1' // implementation 'com.ibm.icu:icu4j:50.1'
// compile 'net.sf.trove4j:trove4j:3.0.3' // implementation 'net.sf.trove4j:trove4j:3.0.3'
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar" legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
compile ("com.getkeepsafe.taptargetview:taptargetview:1.6.1"){ implementation ("com.getkeepsafe.taptargetview:taptargetview:1.6.1"){
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }
compile 'com.github.PhilJay:MPAndroidChart:v3.0.1' implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
compile ("com.github.HITGIF:TextFieldBoxes:1.3.5"){ implementation ("com.github.HITGIF:TextFieldBoxes:1.3.5"){
exclude group: 'com.android.support' exclude group: 'com.android.support'
} }
} }

2
OsmAnd/project.properties
View file

@ -34,3 +34,5 @@ android.library.reference.19=aarDependencies/android.arch.lifecycle-viewmodel-1.
android.library.reference.20=aarDependencies/android.arch.lifecycle-livedata-core-1.1.0 android.library.reference.20=aarDependencies/android.arch.lifecycle-livedata-core-1.1.0
android.library.reference.21=aarDependencies/com.android.support-transition-27.1.0 android.library.reference.21=aarDependencies/com.android.support-transition-27.1.0
android.library.reference.22=aarDependencies/com.android.support-support-media-compat-27.1.0 android.library.reference.22=aarDependencies/com.android.support-support-media-compat-27.1.0
android.library.reference.23=aarDependencies/com.squareup.picasso-picasso-2.71828
android.library.reference.24=aarDependencies/com.android.support-exifinterface-27.1.0

22
OsmAndCore-sample/build.gradle
View file

@ -118,18 +118,18 @@ repositories {
} }
dependencies { dependencies {
compile project(path: ':OsmAnd-java', configuration: 'android') implementation project(path: ':OsmAnd-java', configuration: 'android')
compile 'com.android.support:multidex:1.0.1' implementation 'com.android.support:multidex:1.0.1'
compile 'com.android.support:appcompat-v7:27.1.0' implementation 'com.android.support:appcompat-v7:27.1.0'
compile 'com.android.support:design:27.1.0' implementation 'com.android.support:design:27.1.0'
compile 'commons-logging:commons-logging-api:1.1' implementation 'commons-logging:commons-logging-api:1.1'
compile 'com.moparisthebest:junidecode:0.1.1' implementation 'com.moparisthebest:junidecode:0.1.1'
compile fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs') implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" implementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" debugImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" nativeDebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
releaseCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" releaseImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
} }

4
OsmAndCore-sample/project.properties
View file

@ -14,3 +14,7 @@ android.library.reference.12=aarDependencies/com.android.support-transition-27.1
android.library.reference.13=aarDependencies/com.android.support-recyclerview-v7-27.1.0 android.library.reference.13=aarDependencies/com.android.support-recyclerview-v7-27.1.0
android.library.reference.14=aarDependencies/net.osmand-OsmAndCore_android-0.1-SNAPSHOT android.library.reference.14=aarDependencies/net.osmand-OsmAndCore_android-0.1-SNAPSHOT
android.library.reference.15=aarDependencies/net.osmand-OsmAndCore_androidNativeRelease-0.1-SNAPSHOT android.library.reference.15=aarDependencies/net.osmand-OsmAndCore_androidNativeRelease-0.1-SNAPSHOT
android.library.reference.16=aarDependencies/com.android.support-multidex-1.0.1
android.library.reference.17=aarDependencies/android.arch.lifecycle-viewmodel-1.1.0
android.library.reference.18=aarDependencies/android.arch.lifecycle-livedata-core-1.1.0
android.library.reference.19=aarDependencies/android.arch.core-runtime-1.1.0

3
build.gradle
View file

@ -13,9 +13,10 @@ buildscript {
classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1' classpath 'com.github.ksoichiro:gradle-eclipse-aar-plugin:0.3.1'
} }
} }
apply plugin: 'com.github.ksoichiro.eclipse.aar'
apply plugin: 'com.github.ksoichiro.eclipse.aar'
allprojects { allprojects {
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven {