Commit afb4deed authored by Toni Beier's avatar Toni Beier

Merge branch 'build/normalize_android_support_25.3.1' into 'develop'

Build/normalize android support 25.3.1

See merge request OpenASiST/openasist4android_core!12
parents 90695021 20013d9e
......@@ -132,10 +132,14 @@ dependencies {
compile 'me.dm7.barcodescanner:zxing:1.9.8'
compile 'com.j256.ormlite:ormlite-android:4.48'
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.4'
//android support libraries
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:support-annotations:25.3.1'
compile 'com.android.support:support-vector-drawable:25.3.1'
//simply compile google maps only
//compile 'com.google.android.gms:play-services:11.8.0'
compile 'com.google.android.gms:play-services-maps:12.0.1'
......@@ -148,7 +152,6 @@ dependencies {
compile 'com.loopj.android:android-async-http:1.4.5'
compile 'org.greenrobot:eventbus:3.0.0'
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:support-vector-drawable:24.2.1'
compile 'com.android.support.constraint:constraint-layout:1.1.3'
compile 'com.android.support:preference-v7:25.3.1'
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment