Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
jianjunxiao committed Jul 12, 2017
1 parent 6312d96 commit 05004ac
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 105 deletions.
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,4 @@ dependencies {
testCompile rootProject.ext.dependencies.junit
compile rootProject.ext.dependencies.recyclerview
compile rootProject.ext.dependencies.glide
compile 'com.android.support.constraint:constraint-layout:1.0.2'
}
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'

classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
// classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
// NOTE: Do not place your application config here; they belong
// in the individual module build.gradle files
}
Expand All @@ -24,7 +24,7 @@ task clean(type: Delete) {
delete rootProject.buildDir
}

tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
options.addStringOption('encoding', 'UTF-8')
}
//tasks.withType(Javadoc) {
// options.addStringOption('Xdoclint:none', '-quiet')
// options.addStringOption('encoding', 'UTF-8')
//}
196 changes: 98 additions & 98 deletions nicevideoplayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,101 +45,101 @@ dependencies {
// compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.8.0'
}

apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

def siteUrl = 'https://github.com/xiaoyanger0825/NiceVideoPlayer' // 项目的主页
def gitUrl = 'https://github.com/xiaoyanger0825/NiceVideoPlayer' // Git仓库的url
//发布到组织名称名字,必须填写
group = "com.xiaomark.nicevideoplayer"
//发布到JCenter上的项目名字,必须填写
def libName = "nicevideoplayer"
// 版本号,下次更新是只需要更改版本号即可
version = rootProject.ext.android.versionName

Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
bintray {
user = properties.getProperty("bintray.user")
key = properties.getProperty("bintray.apikey")
pkg {
userOrg = 'xiaomark' //自己创建的organization名称
repo = 'nicevideoplayer'//自己创建的仓库名字
name = libName //上传到JCenter的名字,最终引用的名字
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ['Apache-2.0']//不能随便写,只能是仓库创建时选择的license type
publish = true // 是否是公开项目,公开别人可以引用

version {
name = rootProject.ext.android.versionName
desc = 'a video player libarary for android.'//描述,自己定义
released = new Date()
vcsTag = rootProject.ext.android.versionName
attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin']
}
}
configurations = ['archives']
}

install {
repositories.mavenInstaller {
// This generates POM.xml with proper parameters
pom {
project {
packaging 'aar'
// Add your description here
name 'nicevideoplayer'
description 'a video player libarary for android.'
url siteUrl
// Set your license
licenses {
license {
name 'Apache-2.0' //和之前自己定义的协议一致
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers {
developer {
id 'xiaoyanger0825' //填写bintray或者github的用户名
name 'xiaojianjun' //姓名
email 'xiaojianjun0825@aliyun.com'//邮箱
}
}
scm {
connection gitUrl
developerConnection gitUrl
url siteUrl
}
}
}
}
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
task javadoc(type: Javadoc) {
failOnError false //必须添加以免出错
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
artifacts {
archives javadocJar
archives sourcesJar
}

javadoc {
options {
//如果你的项目里面有中文注释的话,必须将格式设置为UTF-8,不然会出现乱码
encoding "UTF-8"
charSet 'UTF-8'
author true
version true
links "http://docs.oracle.com/javase/7/docs/api"
}
}
//apply plugin: 'com.github.dcendents.android-maven'
//apply plugin: 'com.jfrog.bintray'
//
//def siteUrl = 'https://github.com/xiaoyanger0825/NiceVideoPlayer' // 项目的主页
//def gitUrl = 'https://github.com/xiaoyanger0825/NiceVideoPlayer' // Git仓库的url
////发布到组织名称名字,必须填写
//group = "com.xiaomark.nicevideoplayer"
////发布到JCenter上的项目名字,必须填写
//def libName = "nicevideoplayer"
//// 版本号,下次更新是只需要更改版本号即可
//version = rootProject.ext.android.versionName
//
//Properties properties = new Properties()
//properties.load(project.rootProject.file('local.properties').newDataInputStream())
//bintray {
// user = properties.getProperty("bintray.user")
// key = properties.getProperty("bintray.apikey")
// pkg {
// userOrg = 'xiaomark' //自己创建的organization名称
// repo = 'nicevideoplayer'//自己创建的仓库名字
// name = libName //上传到JCenter的名字,最终引用的名字
// websiteUrl = siteUrl
// vcsUrl = gitUrl
// licenses = ['Apache-2.0']//不能随便写,只能是仓库创建时选择的license type
// publish = true // 是否是公开项目,公开别人可以引用
//
// version {
// name = rootProject.ext.android.versionName
// desc = 'a video player libarary for android.'//描述,自己定义
// released = new Date()
// vcsTag = rootProject.ext.android.versionName
// attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin']
// }
// }
// configurations = ['archives']
//}
//
//install {
// repositories.mavenInstaller {
// // This generates POM.xml with proper parameters
// pom {
// project {
// packaging 'aar'
// // Add your description here
// name 'nicevideoplayer'
// description 'a video player libarary for android.'
// url siteUrl
// // Set your license
// licenses {
// license {
// name 'Apache-2.0' //和之前自己定义的协议一致
// url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
// }
// }
// developers {
// developer {
// id 'xiaoyanger0825' //填写bintray或者github的用户名
// name 'xiaojianjun' //姓名
// email 'xiaojianjun0825@aliyun.com'//邮箱
// }
// }
// scm {
// connection gitUrl
// developerConnection gitUrl
// url siteUrl
// }
// }
// }
// }
//}
//task sourcesJar(type: Jar) {
// from android.sourceSets.main.java.srcDirs
// classifier = 'sources'
//}
//task javadoc(type: Javadoc) {
// failOnError false //必须添加以免出错
// source = android.sourceSets.main.java.srcDirs
// classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
//}
//task javadocJar(type: Jar, dependsOn: javadoc) {
// classifier = 'javadoc'
// from javadoc.destinationDir
//}
//artifacts {
// archives javadocJar
// archives sourcesJar
//}
//
//javadoc {
// options {
// //如果你的项目里面有中文注释的话,必须将格式设置为UTF-8,不然会出现乱码
// encoding "UTF-8"
// charSet 'UTF-8'
// author true
// version true
// links "http://docs.oracle.com/javase/7/docs/api"
// }
//}

0 comments on commit 05004ac

Please sign in to comment.