Skip to content

Commit

Permalink
Merge pull request #19 from AhmadNemati/dev
Browse files Browse the repository at this point in the history
update supportLibraryVersion
  • Loading branch information
AhmadNemati authored Dec 27, 2016
2 parents 0d509f5 + 5f9516f commit 347d58f
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 4 deletions.
67 changes: 67 additions & 0 deletions .idea/markdown-navigator.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/markdown-navigator/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ dependencies {
compile 'com.jakewharton:butterknife:7.0.1'
testCompile 'junit:junit:4.12'
compile project(':windview')

}
Binary file added art/screen.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions windview/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 24
buildToolsVersion "24.0.2"
compileSdkVersion 25
buildToolsVersion "24.0.3"

defaultConfig {
minSdkVersion 14
targetSdkVersion 24
targetSdkVersion 25
versionCode 1
versionName "1.0"

Expand All @@ -26,6 +26,6 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:appcompat-v7:25.0.1'
testCompile 'junit:junit:4.12'
}

0 comments on commit 347d58f

Please sign in to comment.