Update sdk versions, buildToolsVersion, and simplify dependencies.
This commit is contained in:
parent
8584488326
commit
e5f5af506b
@ -41,12 +41,12 @@ android {
|
|||||||
storePassword keystoreProperties['storePassword']
|
storePassword keystoreProperties['storePassword']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileSdkVersion 24
|
compileSdkVersion 25
|
||||||
buildToolsVersion "24.0.2"
|
buildToolsVersion "24.0.3"
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId 'com.philliphsu.clock2'
|
applicationId 'com.philliphsu.clock2'
|
||||||
minSdkVersion 19
|
minSdkVersion 19
|
||||||
targetSdkVersion 24
|
targetSdkVersion 25
|
||||||
versionCode 111
|
versionCode 111
|
||||||
versionName "1.1.1"
|
versionName "1.1.1"
|
||||||
// Disabled for now because we're not ready to
|
// Disabled for now because we're not ready to
|
||||||
@ -79,16 +79,17 @@ dependencies {
|
|||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
testCompile 'junit:junit:4.12'
|
testCompile 'junit:junit:4.12'
|
||||||
testCompile 'org.mockito:mockito-core:1.10.19'
|
testCompile 'org.mockito:mockito-core:1.10.19'
|
||||||
// TODO: delete, not in use
|
|
||||||
testCompile 'org.robolectric:robolectric:3.0'
|
|
||||||
provided 'com.google.auto.value:auto-value:1.2'
|
provided 'com.google.auto.value:auto-value:1.2'
|
||||||
apt 'com.google.auto.value:auto-value:1.2'
|
apt 'com.google.auto.value:auto-value:1.2'
|
||||||
compile 'com.android.support:appcompat-v7:24.2.0'
|
compile 'com.android.support:appcompat-v7:25.1.0'
|
||||||
compile 'com.android.support:design:24.2.0'
|
compile 'com.android.support:design:25.1.0'
|
||||||
compile 'com.android.support:support-v4:24.2.0'
|
compile 'com.android.support:recyclerview-v7:25.1.0'
|
||||||
compile 'com.android.support:recyclerview-v7:24.2.0'
|
compile 'com.android.support:gridlayout-v7:25.1.0'
|
||||||
compile 'com.android.support:gridlayout-v7:24.2.0'
|
compile 'com.android.support:cardview-v7:25.1.0'
|
||||||
compile 'com.android.support:cardview-v7:24.2.0'
|
|
||||||
compile 'com.jakewharton:butterknife:7.0.1'
|
compile 'com.jakewharton:butterknife:7.0.1'
|
||||||
compile 'com.philliphsu:bottomsheetpickers:2.3.0'
|
compile('com.philliphsu:bottomsheetpickers:2.3.0') {
|
||||||
|
exclude group: 'com.android.support', module: 'appcompat-v7'
|
||||||
|
exclude group: 'com.android.support', module: 'design'
|
||||||
|
exclude group: 'com.android.support', module: 'gridlayout-v7'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user