From 803f9c1ccddb4806b31d022d9ffe97896aa947ac Mon Sep 17 00:00:00 2001 From: Byk Date: Fri, 24 Feb 2017 11:36:28 +0800 Subject: [PATCH] Update. gradle config --- README.md | 5 ++-- app/build.gradle | 7 ++++-- avatarview/bintray.gradle | 23 +++++++++++++------ avatarview/build.gradle | 7 +++--- avatarview/docs/javadoc/allclasses-frame.html | 6 ++--- .../docs/javadoc/allclasses-noframe.html | 6 ++--- .../avatarview/AvatarView.ScaleType.html | 8 +++---- .../avatarview/AvatarView.ShapeDisplay.html | 8 +++---- .../cn/byk/pandora/avatarview/AvatarView.html | 8 +++---- .../pandora/avatarview/bean/DisplayInfo.html | 8 +++---- .../byk/pandora/avatarview/bean/ResInfo.html | 8 +++---- .../avatarview/bean/package-frame.html | 6 ++--- .../avatarview/bean/package-summary.html | 8 +++---- .../pandora/avatarview/bean/package-tree.html | 8 +++---- .../ILayoutManager.LayoutInfoGroup.html | 8 +++---- .../avatarview/layout/ILayoutManager.html | 8 +++---- .../avatarview/layout/QQLayoutManager.html | 8 +++---- .../layout/WeChatLayoutManager.html | 8 +++---- .../avatarview/layout/package-frame.html | 6 ++--- .../avatarview/layout/package-summary.html | 8 +++---- .../avatarview/layout/package-tree.html | 8 +++---- .../byk/pandora/avatarview/package-frame.html | 6 ++--- .../pandora/avatarview/package-summary.html | 8 +++---- .../byk/pandora/avatarview/package-tree.html | 8 +++---- .../rule/ConcreteDrawingStrategy.html | 8 +++---- .../avatarview/rule/IDrawingStrategy.html | 8 +++---- .../avatarview/rule/NormalOnePicStrategy.html | 8 +++---- .../avatarview/rule/package-frame.html | 6 ++--- .../avatarview/rule/package-summary.html | 8 +++---- .../pandora/avatarview/rule/package-tree.html | 8 +++---- .../pandora/avatarview/util/BitmapMan.html | 8 +++---- .../pandora/avatarview/util/GraphsMan.html | 8 +++---- .../util/ImageLoader.MultiLoadTarget.html | 8 +++---- .../pandora/avatarview/util/ImageLoader.html | 8 +++---- .../pandora/avatarview/util/ScreenMan.html | 8 +++---- .../avatarview/util/package-frame.html | 6 ++--- .../avatarview/util/package-summary.html | 8 +++---- .../pandora/avatarview/util/package-tree.html | 8 +++---- avatarview/docs/javadoc/constant-values.html | 8 +++---- avatarview/docs/javadoc/deprecated-list.html | 8 +++---- avatarview/docs/javadoc/help-doc.html | 8 +++---- avatarview/docs/javadoc/index-all.html | 8 +++---- avatarview/docs/javadoc/index.html | 4 ++-- avatarview/docs/javadoc/overview-frame.html | 6 ++--- avatarview/docs/javadoc/overview-summary.html | 10 ++++---- avatarview/docs/javadoc/overview-tree.html | 8 +++---- avatarview/install.gradle | 1 + avatarview/src/main/AndroidManifest.xml | 12 +--------- avatarview/src/main/res/values/strings.xml | 2 +- build.gradle | 2 +- config.gradle | 6 ++--- 51 files changed, 193 insertions(+), 190 deletions(-) diff --git a/README.md b/README.md index 60f15af..1e7f28f 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 b420d1e..baadb22 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 a988ae6..36ebb76 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 af4ccf0..2bd7624 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 a58934d..9c4a167 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 e50d420..5c9eeb5 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 fcebad7..e1f2146 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 06ed8e4..7986ea9 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 473b48a..3af814e 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 7d0b844..1320289 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 b9f6610..174908e 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 1fe77ee..e430d8c 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 fafd24f..946178f 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 @@