hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
Conflicts:
	.idea/misc.xml
This commit is contained in:
Phillip Hsu 2016-09-26 18:41:30 -07:00
commit a3d204e4c1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/build.gradle
View File

@ -25,12 +25,12 @@ android {
storePassword keystoreProperties['storePassword'] storePassword keystoreProperties['storePassword']
} }
} }
compileSdkVersion 23 compileSdkVersion 24
buildToolsVersion "23.0.3" buildToolsVersion "24.0.2"
defaultConfig { defaultConfig {
applicationId 'com.philliphsu.clock2' applicationId 'com.philliphsu.clock2'
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 23 targetSdkVersion 24
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
// Disabled for now because we're not ready to // Disabled for now because we're not ready to
@ -67,11 +67,11 @@ dependencies {
testCompile 'org.robolectric:robolectric:3.0' 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:23.4.0' compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:23.4.0' compile 'com.android.support:design:24.2.1'
compile 'com.android.support:support-v4:23.4.0' compile 'com.android.support:support-v4:24.2.1'
compile 'com.android.support:recyclerview-v7:23.4.0' compile 'com.android.support:recyclerview-v7:24.2.1'
compile 'com.android.support:gridlayout-v7:23.4.0' compile 'com.android.support:gridlayout-v7:24.2.1'
compile 'com.android.support:cardview-v7:23.4.0' compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.jakewharton:butterknife:7.0.1' compile 'com.jakewharton:butterknife:7.0.1'
} }