Skip to content

Commit f636460

Browse files
committed
The project now compiles successfully
1 parent 749bc4c commit f636460

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

MaterialDesign/build.gradle

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'com.jfrog.bintray'
44

55
android {
66
compileSdkVersion 19
7-
buildToolsVersion '20.0.0'
7+
buildToolsVersion '21.1.2'
88

99
sourceSets {
1010
main {
@@ -53,8 +53,8 @@ bintray {
5353
}
5454

5555
dependencies {
56-
compile 'com.nineoldandroids:library:2.4.+'
57-
compile 'com.android.support:support-v4:21.+'
56+
compile 'com.nineoldandroids:library:2.4.0'
57+
compile 'com.android.support:support-v4:21.0.3'
5858
}
5959

6060
install {
@@ -76,6 +76,11 @@ install {
7676
name 'Iván Navas'
7777
7878
}
79+
developer {
80+
id 'fess89'
81+
name 'Oleksii Chyrkov'
82+
83+
}
7984
}
8085
scm {
8186
connection gitUrl
@@ -92,18 +97,7 @@ task sourcesJar(type: Jar) {
9297
classifier = 'sources'
9398
}
9499

95-
task javadoc(type: Javadoc) {
96-
source = android.sourceSets.main.java.srcDirs
97-
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
98-
}
99-
100-
task javadocJar(type: Jar, dependsOn: javadoc) {
101-
classifier = 'javadoc'
102-
from javadoc.destinationDir
103-
}
104-
105100
artifacts {
106-
archives javadocJar
107101
archives sourcesJar
108102
}
109103

MaterialDesign/res/values/attributes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<attr name="progress" format="integer" />
2020
<attr name="ringWidth" format="dimension" />
2121
<!-- in switche's view indicate state of view -->
22-
<attr name="check" format="boolean" />
22+
<attr name="checked" format="boolean" />
2323
<attr name="checkBoxSize" format="dimension" />
2424
<attr name="thumbSize" format="dimension" />
2525
<!-- in float button indicate icon resource -->

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
include ':MaterialDesign'
2+
include ':MaterialDesignDemo'

0 commit comments

Comments
 (0)