Dev (#419)

.gitignore

@@ -12,9 +12,6 @@
 build_macos
 build_ios
 
-*/xcshareddata
-xcshareddata/
-
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
 *.xcscmblueprint
 *.xccheckout

Matrix.xcodeproj

@@ -0,0 +1 @@
+./matrix/matrix-iOS/Matrix/Matrix.xcodeproj

README.md

@@ -1,6 +1,6 @@
 ![Matrix-icon](assets/img/readme/header.png)
 
-[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)[![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.6.0-red.svg)](https://github.com/Tencent/matrix/wiki)
+[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)[![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.6.5-red.svg)](https://github.com/Tencent/matrix/wiki)
 
 (中文版本请参看[这里](#matrix_cn))  
 
@@ -172,7 +172,7 @@ At this point, Matrix has been integrated into the app and is beginning to colle
 
 1. Configure `MATRIX_VERSION` in gradle.properties.
 ``` gradle
-  MATRIX_VERSION=0.6.0
+  MATRIX_VERSION=0.6.5
 ```
 
 2. Add `matrix-gradle-plugin` in your build.gradle:
@@ -289,11 +289,11 @@ You can get more about Matrix output at the wiki [The output of Matrix](https://
 
 #### APK Checker Usage
 
-APK Checker can run independently in Jar ([matrix-apk-canary-0.6.0.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.6.0/matrix-apk-canary-0.6.0.jar)）  mode, usage:
+APK Checker can run independently in Jar ([matrix-apk-canary-0.6.5.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.6.5/matrix-apk-canary-0.6.5.jar)）  mode, usage:
 
 
 ```shell
-java -jar matrix-apk-canary-0.6.0.jar
+java -jar matrix-apk-canary-0.6.5.jar
 Usages: 
     --config CONFIG-FILE-PATH
 or
@@ -352,7 +352,7 @@ Matrix is under the BSD license. See the [LICENSE](https://github.com/Tencent/Ma
 
 # <a name="matrix_cn">Matrix</a>
 ![Matrix-icon](assets/img/readme/header.png)
-[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)  [![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.6.0-red.svg)](https://github.com/Tencent/matrix/wiki)
+[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)  [![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-0.6.5-red.svg)](https://github.com/Tencent/matrix/wiki)
 
 **Matrix** 是一款微信研发并日常使用的应用性能接入框架，支持iOS, macOS和Android。
 Matrix 通过接入各种性能监控方案，对性能监控项的异常数据进行采集和分析，输出相应的问题分析、定位与优化建议，从而帮助开发者开发出更高质量的应用。
@@ -510,7 +510,7 @@ Matrix-android 当前监控范围包括：应用安装包大小，帧率变化
 
 1. 在你项目根目录下的 gradle.properties 中配置要依赖的 Matrix 版本号，如：
 ``` gradle
-  MATRIX_VERSION=0.6.0
+  MATRIX_VERSION=0.6.5
 ```
 
 2. 在你项目根目录下的 build.gradle 文件添加 Matrix 依赖，如：
@@ -624,10 +624,10 @@ Matrix 分析后的输出字段的含义请查看 [Matrix 输出内容的含义
 
 #### APK Checker
 
-APK Check 以独立的 jar 包提供 ([matrix-apk-canary-0.6.0.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.6.0/matrix-apk-canary-0.6.0.jar)），你可以运行：
+APK Check 以独立的 jar 包提供 ([matrix-apk-canary-0.6.5.jar](https://jcenter.bintray.com/com/tencent/matrix/matrix-apk-canary/0.6.5/matrix-apk-canary-0.6.5.jar)），你可以运行：
 
 ```cmd
-java -jar matrix-apk-canary-0.6.0.jar
+java -jar matrix-apk-canary-0.6.5.jar
 ```
 
 查看 Usages 来使用它。

matrix-wechat.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |matrix|
   matrix.name             = 'matrix-wechat'
-  matrix.version          = '0.5.2'
+  matrix.version          = '0.6.1'
   matrix.summary          = 'Matrix for iOS/macOS is a performance probe tool developed and used by WeChat.'
   matrix.description      = <<-DESC
                             Matrix for iOS/macOS is a performance probe tool developed and used by WeChat. 

matrix/matrix-android/build.gradle

@@ -1,15 +1,17 @@
 buildscript {
     repositories {
+
         mavenLocal()
         google()
         jcenter()
+
     }
 
     dependencies {
         // classpath
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'digital.wup:android-maven-publish:3.2.0'
+        classpath 'digital.wup:android-maven-publish:3.6.2'
     }
 
 
@@ -20,6 +22,7 @@ buildscript {
 
 allprojects {
     repositories {
+
         mavenLocal()
         google()
         jcenter()
@@ -43,6 +46,7 @@ ext {
 
     GROUP = 'com.tencent.matrix'
     VERSION_NAME = "${VERSION_NAME_PREFIX}${VERSION_NAME_SUFFIX}"
+    PUBLISH_CHANNEL = "${PUBLISH_CHANNEL}"
 
     POM_PACKAGING = "pom"
     POM_DESCRIPTION = "matrix"

matrix/matrix-android/gradle.properties

@@ -15,5 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 #Tue Jun 20 10:24:33 CST 2017
 
 
-VERSION_NAME_PREFIX=0.6.0
-VERSION_NAME_SUFFIX=
+VERSION_NAME_PREFIX=0.6.5
+VERSION_NAME_SUFFIX=
+## two options: Internal (for wechat ),  External (for outsize person)
+PUBLISH_CHANNEL=External