diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index d668110373..a3de7dbe0a 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -40,7 +40,6 @@ android { defaultConfig { minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14 targetSdkVersion 23 - multiDexEnabled true versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode //versionName already assigned in code //versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName @@ -323,10 +322,10 @@ repositories { } dependencies { - compile project(path: ":OsmAnd-java", configuration: "android") - compile project(":eclipse-compile:design") - compile project(":eclipse-compile:cardview") -// compile project(":eclipse-compile:recyclerview") + compile project(path: ':OsmAnd-java', configuration: 'android') + compile project(':eclipse-compile:design') + compile project(':eclipse-compile:cardview') + // compile project(":eclipse-compile:recyclerview") compile fileTree( dir: "libs", include: ["*.jar"], @@ -344,5 +343,5 @@ dependencies { qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease: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') } diff --git a/OsmAnd/libs/android-support-multidex.jar b/OsmAnd/libs/android-support-multidex.jar new file mode 100644 index 0000000000..67b0aa74e9 Binary files /dev/null and b/OsmAnd/libs/android-support-multidex.jar differ diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 5064fd62ee..98211f2018 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -63,8 +63,6 @@ import java.util.Locale; import btools.routingapp.BRouterServiceConnection; import btools.routingapp.IBRouterService; - - public class OsmandApplication extends MultiDexApplication { public static final String EXCEPTION_PATH = "exception.log"; //$NON-NLS-1$ private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class); diff --git a/plugins/Osmand-ParkingPlugin/build.gradle b/plugins/Osmand-ParkingPlugin/build.gradle index 17aa1d99f2..eada5a8a41 100644 --- a/plugins/Osmand-ParkingPlugin/build.gradle +++ b/plugins/Osmand-ParkingPlugin/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 + compileSdkVersion 23 buildToolsVersion "23.0.1" signingConfigs { @@ -22,7 +22,7 @@ android { defaultConfig { minSdkVersion 9 - targetSdkVersion 21 + targetSdkVersion 23 } lintOptions { @@ -64,4 +64,5 @@ repositories { } dependencies { + compile project(":eclipse-compile:appcompat") }