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

Gradle dependecy replaced with JAR

Browse source
This commit is contained in:
GaidamakUA 2015-11-18 11:58:29 +02:00
parent ca40d8a57b
commit 1523c82ecf
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/build.gradle
View file

@ -40,7 +40,6 @@ android {
defaultConfig { defaultConfig {
minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14 minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
targetSdkVersion 23 targetSdkVersion 23
multiDexEnabled true
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 already assigned in code //versionName already assigned in code
//versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName //versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
@ -323,10 +322,10 @@ repositories {
} }
dependencies { dependencies {
compile project(path: ":OsmAnd-java", configuration: "android") compile project(path: ':OsmAnd-java', configuration: 'android')
compile project(":eclipse-compile:design") compile project(':eclipse-compile:design')
compile project(":eclipse-compile:cardview") compile project(':eclipse-compile:cardview')
// compile project(":eclipse-compile:recyclerview") // compile project(":eclipse-compile:recyclerview")
compile fileTree( compile fileTree(
dir: "libs", dir: "libs",
include: ["*.jar"], include: ["*.jar"],
@ -344,5 +343,5 @@ dependencies {
qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar" 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"
compile 'com.android.support:multidex:1.0.0' compile files('libs/android-support-multidex.jar')
} }

BIN
OsmAnd/libs/android-support-multidex.jar Normal file
View file

Binary file not shown.

2
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -63,8 +63,6 @@ import java.util.Locale;
import btools.routingapp.BRouterServiceConnection; import btools.routingapp.BRouterServiceConnection;
import btools.routingapp.IBRouterService; import btools.routingapp.IBRouterService;
public class OsmandApplication extends MultiDexApplication { public class OsmandApplication extends MultiDexApplication {
public static final String EXCEPTION_PATH = "exception.log"; //$NON-NLS-1$ public static final String EXCEPTION_PATH = "exception.log"; //$NON-NLS-1$
private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class); private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class);

5
plugins/Osmand-ParkingPlugin/build.gradle
View file

@ -1,7 +1,7 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 21 compileSdkVersion 23
buildToolsVersion "23.0.1" buildToolsVersion "23.0.1"
signingConfigs { signingConfigs {
@ -22,7 +22,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 21 targetSdkVersion 23
} }
lintOptions { lintOptions {
@ -64,4 +64,5 @@ repositories {
} }
dependencies { dependencies {
compile project(":eclipse-compile:appcompat")
} }