Commit 62f951f7 authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Auto merge messed up the dependencies

parent 0cf157a5
Subproject commit a47a7095bd7294b71953018a1644ca2e0110d974
Subproject commit 870ccdfa117bcccc474418fd05a62cb7d9539f7e
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 26
buildToolsVersion "26.0.2"
defaultConfig {
applicationId "com.frostnerd.dnschanger"
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 26
versionCode 27
versionName "1.10"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......@@ -20,8 +20,11 @@ android {
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile project(path: ':library')
compile 'com.android.support:appcompat-v7:26.0.2'
compile 'com.android.support:cardview-v7:26.0.2'
compile 'com.android.support:recyclerview-v7:26.0.2'
compile 'com.android.support:preference-v14:26.0.2'
compile project(path: ':AndroidUtils:library')
testCompile 'junit:junit:4.12'
compile 'dnsjava:dnsjava:2.1.8'
}
Supports Markdown
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