Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
2908844f27
1 changed files with 4 additions and 4 deletions
|
@ -385,10 +385,10 @@ dependencies {
|
||||||
// compile project(':eclipse-compile:design')
|
// compile project(':eclipse-compile:design')
|
||||||
// compile project(':eclipse-compile:cardview')
|
// compile project(':eclipse-compile:cardview')
|
||||||
// compile project(':eclipse-compile:gridlayout')
|
// compile project(':eclipse-compile:gridlayout')
|
||||||
compile 'com.android.support:gridlayout-v7:26.+'
|
compile 'com.android.support:gridlayout-v7:25.+'
|
||||||
compile 'com.android.support:cardview-v7:26.+'
|
compile 'com.android.support:cardview-v7:25.+'
|
||||||
compile 'com.android.support:appcompat-v7:26.+'
|
compile 'com.android.support:appcompat-v7:25.+'
|
||||||
compile 'com.android.support:design:26.+'
|
compile 'com.android.support:design:25.+'
|
||||||
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
|
compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
|
||||||
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
|
legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
|
||||||
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
|
qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
|
||||||
|
|
Loading…
Reference in a new issue