diff --git a/README.md b/README.md
index 60f15af52e03ffb32f34330e02974e2a828f8e15..1e7f28f43dfbb020c5399ae28470442c041d55fc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
## AvatarView
-[ ![Download](https://api.bintray.com/packages/blueyuki/maven/AvatarView/images/download.svg) ](https://bintray.com/blueyuki/maven/AvatarView/_latestVersion)
+[ ![Maven](https://api.bintray.com/packages/blueyuki/maven/AvatarView/images/download.svg) ](https://bintray.com/blueyuki/maven/AvatarView/_latestVersion)
多头像显示视图,适用于普通用户头像以及群组多头像显示
[README on GitHub](https://github.com/bluesofy/AvatarView/blob/master/README.md)
@@ -13,8 +13,9 @@
### 使用说明 Usage
- 添加依赖
```gradle
-compile 'cn.byk.pandora:avatarview:1.2'
+compile 'cn.byk.pandora:avatarview:1.4'
+// 第三方依赖库外部添加,版本号自由
compile 'com.github.bumptech.glide:glide:3.7.0' // Glide库
compile 'com.android.support:support-v4:25.1.1' // v4库
```
diff --git a/app/build.gradle b/app/build.gradle
index b420d1ecce842fd608322e627096aafd9a9fe223..baadb2212fa282099b6662249385505baaf2c9ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode Integer.parseInt(rootProject.ext.versionCode)
+ versionCode rootProject.ext.versionCode as int
versionName rootProject.ext.libraryVersion
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -32,7 +32,10 @@ dependencies {
})
// compile project(':avatarview')
- compile 'cn.byk.pandora:avatarview:1.2'
+ compile 'cn.byk.pandora:avatarview:1.4'
+ compile "com.android.support:support-v4:$rootProject.supportLibraryVersion"
compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
+
+ compile 'com.github.bumptech.glide:glide:3.7.0'
}
diff --git a/avatarview/bintray.gradle b/avatarview/bintray.gradle
index a988ae6b38380eb2586e42311da4114e4c935ec0..36ebb76cc51b8fee5d4e3699ff85cc12a6d63ad1 100644
--- a/avatarview/bintray.gradle
+++ b/avatarview/bintray.gradle
@@ -8,17 +8,23 @@ task sourcesJar(type: Jar) {
}
task javadoc(type: Javadoc) {
- source = android.sourceSets.main.java.srcDirs
- classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
failOnError false
+ source = android.sourceSets.main.java.sourceFiles
+ classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+ classpath += configurations.compile
+}
- options.encoding "UTF-8"
- options.charSet 'UTF-8'
- options.author true
- options.version true
- options.links javaDocUrl
+javadoc {
+ options {
+ encoding "UTF-8"
+ charSet 'UTF-8'
+ author true
+ version true
+ links javaDocUrl
+ }
}
+// build a jar with javadoc
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
@@ -50,6 +56,7 @@ bintray {
key = properties.getProperty("bintray.apikey")
configurations = ['archives']
+
pkg {
repo = bintrayRepo
name = bintrayName
@@ -60,7 +67,9 @@ bintray {
publish = true
publicDownloadNumbers = true
version {
+ name = libraryVersion
desc = libraryDescription
+ vcsTag = libraryVersion
}
}
}
\ No newline at end of file
diff --git a/avatarview/build.gradle b/avatarview/build.gradle
index af4ccf05b5fb35048c5004e67e02d09f61c84ad6..2bd76244875d3ddbb41c08e4640aaa50be7c1c6b 100644
--- a/avatarview/build.gradle
+++ b/avatarview/build.gradle
@@ -8,7 +8,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode Integer.parseInt(rootProject.ext.versionCode)
+ versionCode rootProject.ext.versionCode as int
versionName rootProject.ext.libraryVersion
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -23,14 +23,13 @@ android {
}
dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile "junit:junit:$rootProject.ext.junitVersion"
androidTestCompile("com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion", {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.github.bumptech.glide:glide:3.7.0'
- compile "com.android.support:support-v4:$rootProject.supportLibraryVersion"
+ provided 'com.github.bumptech.glide:glide:3.7.0'
+ provided "com.android.support:support-v4:$rootProject.supportLibraryVersion"
}
apply from: 'install.gradle'
diff --git a/avatarview/docs/javadoc/allclasses-frame.html b/avatarview/docs/javadoc/allclasses-frame.html
index a58934d6cb58fdff52b0c22caeea83946ba194c9..9c4a167261116695e7765b9f0784bab1b18cfa6c 100644
--- a/avatarview/docs/javadoc/allclasses-frame.html
+++ b/avatarview/docs/javadoc/allclasses-frame.html
@@ -2,10 +2,10 @@
-
+
-所有类 (avatarview 1.2 API)
-
+所有类 (avatarview 1.4 API)
+
diff --git a/avatarview/docs/javadoc/allclasses-noframe.html b/avatarview/docs/javadoc/allclasses-noframe.html
index e50d42001b23a0517ca8768da4d7ae94cb8d6b12..5c9eeb5d5b21022f13daee9ac2847883e82afb54 100644
--- a/avatarview/docs/javadoc/allclasses-noframe.html
+++ b/avatarview/docs/javadoc/allclasses-noframe.html
@@ -2,10 +2,10 @@
-
+
-所有类 (avatarview 1.2 API)
-
+所有类 (avatarview 1.4 API)
+
diff --git a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/AvatarView.ScaleType.html b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/AvatarView.ScaleType.html
index fcebad7f37f0f875c65a8ba05fc62488779d33de..e1f21469e376bd5bdad8936bf77e442a01155259 100644
--- a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/AvatarView.ScaleType.html
+++ b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/AvatarView.ScaleType.html
@@ -2,10 +2,10 @@
-
+
-AvatarView.ScaleType (avatarview 1.2 API)
-
+AvatarView.ScaleType (avatarview 1.4 API)
+
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
diff --git a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/bean/package-summary.html b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/bean/package-summary.html
index 06ed8e4c268ef6c6e1831103be543d2b6a58364a..7986ea95f34e1bcac08e72f7922a8b519a6a8dd4 100644
--- a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/bean/package-summary.html
+++ b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/bean/package-summary.html
@@ -2,10 +2,10 @@
-
+
-cn.byk.pandora.avatarview.bean (avatarview 1.2 API)
-
+cn.byk.pandora.avatarview.bean (avatarview 1.4 API)
+
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
diff --git a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/layout/package-summary.html b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/layout/package-summary.html
index 473b48a5d4d5da37b0cebcb962dd6eb365a8e26c..3af814e50e29893792d3b9522eac586bd461e767 100644
--- a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/layout/package-summary.html
+++ b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/layout/package-summary.html
@@ -2,10 +2,10 @@
-
+
-cn.byk.pandora.avatarview.layout (avatarview 1.2 API)
-
+cn.byk.pandora.avatarview.layout (avatarview 1.4 API)
+
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
diff --git a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/package-summary.html b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/package-summary.html
index 7d0b8446064fe37fff7bb155f926723309c69870..1320289ea7f800bbe670cd8eb6fce1400d797c0d 100644
--- a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/package-summary.html
+++ b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/package-summary.html
@@ -2,10 +2,10 @@
-
+
-cn.byk.pandora.avatarview (avatarview 1.2 API)
-
+cn.byk.pandora.avatarview (avatarview 1.4 API)
+
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
diff --git a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/rule/package-summary.html b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/rule/package-summary.html
index b9f6610c50aadde8910ac39bad5946456afdb326..174908ed26a89769aca0c0ec287149d7f523a1ba 100644
--- a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/rule/package-summary.html
+++ b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/rule/package-summary.html
@@ -2,10 +2,10 @@
-
+
-cn.byk.pandora.avatarview.rule (avatarview 1.2 API)
-
+cn.byk.pandora.avatarview.rule (avatarview 1.4 API)
+
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
diff --git a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/util/package-summary.html b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/util/package-summary.html
index 1fe77eed8a22e8a1a852aae9bed4e244f25daee2..e430d8c7c457229ea24db8e927e01d9d86f9367f 100644
--- a/avatarview/docs/javadoc/cn/byk/pandora/avatarview/util/package-summary.html
+++ b/avatarview/docs/javadoc/cn/byk/pandora/avatarview/util/package-summary.html
@@ -2,10 +2,10 @@
-
+
-cn.byk.pandora.avatarview.util (avatarview 1.2 API)
-
+cn.byk.pandora.avatarview.util (avatarview 1.4 API)
+
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
diff --git a/avatarview/docs/javadoc/overview-summary.html b/avatarview/docs/javadoc/overview-summary.html
index fafd24f8f11840182a8a3b1d58b44c777abb6ae3..946178fe152b5bcde681c9a9f808d096ec401b47 100644
--- a/avatarview/docs/javadoc/overview-summary.html
+++ b/avatarview/docs/javadoc/overview-summary.html
@@ -2,10 +2,10 @@
-
+
-概览 (avatarview 1.2 API)
-
+概览 (avatarview 1.4 API)
+
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@