Merge branch 'release/v6.2.7'

lipangit · Jan 22, 2018 · 850db06 · 850db06
2 parents 3bedfc1 + da8be15
commit 850db06
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 李盼 Nathen
+Copyright (c) 2015-2018 李盼 Nathen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README-ZH.md b/README-ZH.md
@@ -2,7 +2,7 @@
 --
 <p align="center">
 <a href="http://developer.android.com/index.html"><img src="https://img.shields.io/badge/platform-android-green.svg"></a>
-<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.5-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.7-green.svg"></a>
 <a href="http://choosealicense.com/licenses/mit/"><img src="https://img.shields.io/badge/license-MIT-green.svg"></a>
 <a href="https://android-arsenal.com/details/1/3269"><img src="https://img.shields.io/badge/Android%20Arsenal-jiaozivideoplayer-green.svg?style=true"></a>
 </p>
@@ -24,7 +24,7 @@
 
 ## 效果
 
-**[jiaozivideoplayer-6.2.5.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.5/jiaozivideoplayer-6.2.5.apk)**
+**[jiaozivideoplayer-6.2.7.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.7/jiaozivideoplayer-6.2.7.apk)**
 
 ![Demo Screenshot][1]
 
@@ -36,10 +36,10 @@
 
 1.添加类库
 ```gradle
-compile 'cn.jzvd:jiaozivideoplayer:6.2.5'
+compile 'cn.jzvd:jiaozivideoplayer:6.2.7'
 ```
 
-或直接下载 [jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.5) (不建议)
+或直接下载 [jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.7) (不建议)
 
 2.添加布局
 ```xml
@@ -131,7 +131,7 @@ protected void onPause() {
 
 ## License MIT
 
-Copyright (c) 2015-2016 李盼 Nathen
+Copyright (c) 2015-2018 李盼 Nathen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 --
 <p align="center">
 <a href="http://developer.android.com/index.html"><img src="https://img.shields.io/badge/platform-android-green.svg"></a>
-<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.5-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.7-green.svg"></a>
 <a href="http://choosealicense.com/licenses/mit/"><img src="https://img.shields.io/badge/license-MIT-green.svg"></a>
 <a href="https://android-arsenal.com/details/1/3269"><img src="https://img.shields.io/badge/Android%20Arsenal-jiaozivideoplayer-green.svg?style=true"></a>
 </p>
@@ -35,7 +35,7 @@ Q群:490442439 验证信息:jzvd
 
 ## A demo showing available effects
 
-**[jiaozivideoplayer-6.2.5.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.5/jiaozivideoplayer-6.2.5.apk)**
+**[jiaozivideoplayer-6.2.7.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.7/jiaozivideoplayer-6.2.7.apk)**
 
 ![Demo Screenshot][1]
 
@@ -47,10 +47,10 @@ Only five steps to use the player.
 
 1.Import library
 ```gradle
-compile 'cn.jzvd:jiaozivideoplayer:6.2.5'
+compile 'cn.jzvd:jiaozivideoplayer:6.2.7'
 ```
 
-Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.5) (not recommended)
+Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.7) (not recommended)
 
 2.Add JZVideoPlayer in your layout
 ```xml
@@ -144,7 +144,7 @@ This project is dedicated to small and medium-sized app integrated video playbac
 
 ## License MIT
 
-Copyright (c) 2015-2016 李盼 Nathen
+Copyright (c) 2015-2018 李盼 Nathen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "cn.jzvd.demo"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 76
-        versionName "6.2.5"
+        versionCode 77
+        versionName "6.2.7"
     }
     signingConfigs {
         releaseConfig {

diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle
@@ -22,26 +22,26 @@ signing {
 
 group = "cn.jzvd"
 archivesBaseName = "jiaozivideoplayer"
-version = "6.2.5"
+version = "6.2.7"
 
 uploadArchives {
     repositories {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
             repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: hasProperty('ossrhUsername') ? ossrhUsername : "",
-                        password: hasProperty('ossrhPassword') ? ossrhPassword : "")
+                authentication(userName: getProperty('ossrhUsername'),
+                                 password: getProperty('ossrhPassword'))
             }
 
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: hasProperty('ossrhUsername') ? ossrhUsername : "",
-                        password: hasProperty('ossrhPassword') ? ossrhPassword : "")
-            }
+//            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+//                authentication(userName: getProperty('ossrhUsername'),
+//                        password: getProperty('ossrhPassword'))
+//            }
 
             pom.project {
                 name 'jiaozivideoplayer'
-                packaging 'jar'
+                packaging 'aar'
                 // optionally artifactId can be defined here
                 description 'android videoplayer videoview 安卓视频播放器 全屏 播放器列表全屏 仿今日头条UI'
                 url 'https://github.com/lipangit/jiaozivideoplayer'

diff --git a/jiaozivideoplayer/build.gradle b/jiaozivideoplayer/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 76
-        versionName "6.2.5"
+        versionCode 77
+        versionName "6.2.7"
     }
     buildTypes {
         release {