Merge branch 'release/0.6.0' into develop

liuming2049 · Apr 11, 2020 · f6c863c · f6c863c
2 parents 1ab8a60 + 95c3d93
commit f6c863c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
+
+---
+## 0.6.0 (2020-04-11)
+
+* add input process for tui demo ([e479d4e](https://github.com/befovy/ijkplayer/commit/e479d4e75fd05ed3f5e0e64a6722d8a900bd9774))
+* add SDL2 audio and video render, add glfw video render. ([9e3da67](https://github.com/befovy/ijkplayer/commit/9e3da67ef7a1c0f71b93157a82f8bbb41331e5bc))
+* C style API for Mac OS ([cef0b89](https://github.com/befovy/ijkplayer/commit/cef0b897827fdb81e3cd40e3d14d74e0e47ee5e1))
+* ijkplayer desktop works on Mac OS ([8da29be](https://github.com/befovy/ijkplayer/commit/8da29bec7b53579ba7cb4d8e8176b1be219227d0))
+* notify current position option ([1629f87](https://github.com/befovy/ijkplayer/commit/1629f874bee484b2999afdf9976a8cd26eedd0df))
+
+
 ---
-### 0.5.1 (2020-02-21)
+
+## 0.5.1 (2020-02-21)
 
 ### Features
 

diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=0.5.1
-VERSION_CODE=000501
+VERSION_NAME=0.6.0
+VERSION_CODE=000600
 GROUP=com.befovy.fijkplayer
 
 # http://central.sonatype.org/pages/requirements.html

diff --git a/ios/CocoaPodsPub/BIJKPlayer.podspec b/ios/CocoaPodsPub/BIJKPlayer.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "BIJKPlayer"
-  spec.version      = "0.5.1"
+  spec.version      = "0.6.0"
   spec.summary      = "ijkplayer iOS video player SDK"
 
   spec.author       = { "befovy" => "befovy@gmail.com" }