Merge from iqiyi/xCrash main branch

.gitignore

@@ -1,12 +1,11 @@
 .DS_Store
 
-libs/
-obj/
-
 build/
+.cxx/
 .gradle/
 .idea/
 *.iml
 *.log
 *.so
+wrap.sh
 local.properties

README.md

@@ -1,26 +1,28 @@
+<p align="center"><img src="doc/xcrash_logo.png" alt="xCrash Logo" width="450px"></p>
+
 # xCrash
 
 ![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
 ![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
-![](https://img.shields.io/badge/release-2.4.8-red.svg?style=flat)
-![](https://img.shields.io/badge/Android-4.0%20--%2010-blue.svg?style=flat)
-![](https://img.shields.io/badge/arch-armeabi%20%7C%20armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
+![](https://img.shields.io/badge/release-3.0.0-red.svg?style=flat)
+![](https://img.shields.io/badge/Android-4.1%20--%2011-blue.svg?style=flat)
+![](https://img.shields.io/badge/armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
 xCrash provides the Android app with the ability to capture java crash, native crash and ANR. No root permission or any system permissions are required.
 
-xCrash can generate a tombstone file (similar format as Android system's tombstone file) in the directory you specified when the app process crashes or ANRs.
-
 <p align="left"><img src="doc/intro.png" alt="intro" width="320px"></p>
 
+xCrash can generate a tombstone file (similar format as Android system's tombstone file) in the directory you specified when the app process crashes or ANRs.
+
 xCrash has been used in many Android apps (including iQIYI video) on different platforms (mobile, tablet, TV) of [iQIYI](http://www.iqiyi.com/) for many years.
 
 [README 中文版](README.zh-CN.md)
 
 
 ## Features
 
-* Support Android 4.0 - 10 (API level 14 - 29).
-* Support armeabi, armeabi-v7a, arm64-v8a, x86 and x86_64.
+* Support Android 4.1 - 11 (API level 16 - 30).
+* Support armeabi-v7a, arm64-v8a, x86 and x86_64.
 * Capturing java crash, native crash and ANR.
 * Dumping detailed statistics about process, threads, memory, FD and network.
 * Setting which thread's info should be dumped via regular expressions.
@@ -30,12 +32,10 @@ xCrash has been used in many Android apps (including iQIYI video) on different p
 ## Tombstone File Previews
 
 * [java crash](doc/tombstone_java.txt)
-* [native crash (armeabi)](doc/tombstone_native_armeabi.txt)
 * [native crash (armeabi-v7a)](doc/tombstone_native_armeabi-v7a.txt)
 * [native crash (arm64-v8a)](doc/tombstone_native_arm64-v8a.txt)
 * [native crash (x86)](doc/tombstone_native_x86.txt)
 * [native crash (x86_64)](doc/tombstone_native_x86_64.txt)
-* [ANR (armeabi)](doc/tombstone_anr_armeabi.txt)
 * [ANR (armeabi-v7a)](doc/tombstone_anr_armeabi-v7a.txt)
 * [ANR (arm64-v8a)](doc/tombstone_anr_arm64-v8a.txt)
 * [ANR (x86)](doc/tombstone_anr_x86.txt)
@@ -62,7 +62,7 @@ xCrash has been used in many Android apps (including iQIYI video) on different p
 
 ```Gradle
 dependencies {
-    implementation 'com.iqiyi.xcrash:xcrash-android-lib:2.4.8'
+    implementation 'com.iqiyi.xcrash:xcrash-android-lib:3.0.0'
 }
 ```
 
@@ -72,7 +72,7 @@ dependencies {
 android {
     defaultConfig {
         ndk {
-            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
     }
 }
@@ -109,39 +109,26 @@ class MyCustomApplication : Application() {
 
 Tombstone files will be written to `Context#getFilesDir() + "/tombstones"` directory by default. (usually in: `/data/data/PACKAGE_NAME/files/tombstones`)
 
-There is a more practical and complex sample app in the [src/java/xcrash/xcrash_sample](src/java/xcrash/xcrash_sample) folder.
+There is a more practical and complex sample app in the [xcrash_sample](xcrash_sample) folder.
 
 
 ## Build
 
 If you want to build xCrash from source code. Follow this guide:
 
-#### 1. Download [Android NDK r16b](https://developer.android.com/ndk/downloads/revision_history.html), set PATH environment. 
 
-#### 2. Build and copy the native libraries.
+#### Build AAR library.
 
 ```
-cd ./src/native/
-./build.sh
-./install.sh
-```
-
-#### 3. Build AAR library.
-
-```
-cd ./src/java/xcrash/
 ./gradlew :xcrash_lib:build
 ```
 
 
 ## Support
 
-1. Check the [xcrash-sample](src/java/xcrash/xcrash_sample).
-2. Communicate on [GitHub issues](https://github.com/iqiyi/xCrash/issues).
-3. Email: <a href="mailto:caikelun@gmail.com">caikelun@gmail.com</a>
-4. QQ group: 603635869. QR code:
-
-<p align="left"><img src="doc/qq_group.jpg" alt="qq group" width="300px"></p>
+* [GitHub Issues](https://github.com/iqiyi/xCrash/issues)
+* [GitHub Discussions](https://github.com/iqiyi/xCrash/discussions)
+* Email: <a href="mailto:caikelun@gmail.com">caikelun@gmail.com</a>, <a href="mailto:xuqnqn@qq.com">xuqnqn@qq.com</a>
 
 
 ## Contributing

README.zh-CN.md

@@ -1,26 +1,28 @@
+<p align="center"><img src="doc/xcrash_logo.png" alt="xCrash Logo" width="450px"></p>
+
 # xCrash
 
 ![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
 ![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
-![](https://img.shields.io/badge/release-2.4.8-red.svg?style=flat)
-![](https://img.shields.io/badge/Android-4.0%20--%2010-blue.svg?style=flat)
-![](https://img.shields.io/badge/arch-armeabi%20%7C%20armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
+![](https://img.shields.io/badge/release-3.0.0-red.svg?style=flat)
+![](https://img.shields.io/badge/Android-4.1%20--%2011-blue.svg?style=flat)
+![](https://img.shields.io/badge/armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
 xCrash 能为安卓 app 提供捕获 java 崩溃，native 崩溃和 ANR 的能力。不需要 root 权限或任何系统权限。
 
-xCrash 能在 app 进程崩溃或 ANR 时，在你指定的目录中生成一个 tombstone 文件（格式与安卓系统的 tombstone 文件类似）。
-
 <p align="left"><img src="doc/intro.png" alt="intro" width="320px"></p>
 
+xCrash 能在 app 进程崩溃或 ANR 时，在你指定的目录中生成一个 tombstone 文件（格式与安卓系统的 tombstone 文件类似）。
+
 xCrash 已经在 [爱奇艺](http://www.iqiyi.com/) 的不同平台（手机，平板，电视）的很多安卓 app（包括爱奇艺视频）中被使用了很多年。
 
 [README English Version](README.md)
 
 
 ## 特征
 
-* 支持 Android 4.0 - 10（API level 14 - 29）。
-* 支持 armeabi，armeabi-v7a，arm64-v8a，x86 和 x86_64。
+* 支持 Android 4.1 - 11（API level 16 - 30）。
+* 支持 armeabi-v7a，arm64-v8a，x86 和 x86_64。
 * 捕获 java 崩溃，native 崩溃和 ANR。
 * 获取详细的进程、线程、内存、FD、网络统计信息。
 * 通过正则表达式设置需要获取哪些线程的信息。
@@ -30,12 +32,10 @@ xCrash 已经在 [爱奇艺](http://www.iqiyi.com/) 的不同平台（手机，
 ## Tombstone 文件预览
 
 * [java 崩溃](doc/tombstone_java.txt)
-* [native 崩溃 (armeabi)](doc/tombstone_native_armeabi.txt)
 * [native 崩溃 (armeabi-v7a)](doc/tombstone_native_armeabi-v7a.txt)
 * [native 崩溃 (arm64-v8a)](doc/tombstone_native_arm64-v8a.txt)
 * [native 崩溃 (x86)](doc/tombstone_native_x86.txt)
 * [native 崩溃 (x86_64)](doc/tombstone_native_x86_64.txt)
-* [ANR (armeabi)](doc/tombstone_anr_armeabi.txt)
 * [ANR (armeabi-v7a)](doc/tombstone_anr_armeabi-v7a.txt)
 * [ANR (arm64-v8a)](doc/tombstone_anr_arm64-v8a.txt)
 * [ANR (x86)](doc/tombstone_anr_x86.txt)
@@ -62,7 +62,7 @@ xCrash 已经在 [爱奇艺](http://www.iqiyi.com/) 的不同平台（手机，
 
 ```Gradle
 dependencies {
-    implementation 'com.iqiyi.xcrash:xcrash-android-lib:2.4.8'
+    implementation 'com.iqiyi.xcrash:xcrash-android-lib:3.0.0'
 }
 ```
 
@@ -72,7 +72,7 @@ dependencies {
 android {
     defaultConfig {
         ndk {
-            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
     }
 }
@@ -109,39 +109,23 @@ class MyCustomApplication : Application() {
 
 Tombstone 文件默认将被写入到 `Context#getFilesDir() + "/tombstones"` 目录。（通常在： `/data/data/PACKAGE_NAME/files/tombstones`）
 
-在 [src/java/xcrash/xcrash_sample](src/java/xcrash/xcrash_sample) 文件夹中，有一个更实际和复杂的示例 app。
+在 [xcrash_sample](xcrash_sample) 文件夹中，有一个更实际和复杂的示例 app。
 
 
 ## 构建
 
-如果你想编译 xCrash 的源码。请按以下步骤进行：
-
-#### 1. 下载 [Android NDK r16b](https://developer.android.com/ndk/downloads/revision_history.html)，设置 PATH 环境变量。
-
-#### 2. 编译和复制 native 库。
-
-```
-cd ./src/native/
-./build.sh
-./install.sh
-```
-
-#### 3. 编译 AAR 库。
+#### 编译 xCrash AAR 库:
 
 ```
-cd ./src/java/xcrash/
 ./gradlew :xcrash_lib:build
 ```
 
 
 ## 技术支持
 
-1. 查看 [xcrash-sample](src/java/xcrash/xcrash_sample)。
-2. 在 [GitHub issues](https://github.com/iqiyi/xCrash/issues) 交流。
-3. 邮件: <a href="mailto:caikelun@gmail.com">caikelun@gmail.com</a>
-4. QQ 群: 603635869。二维码:
-
-<p align="left"><img src="doc/qq_group.jpg" alt="qq group" width="300px"></p>
+* [GitHub Issues](https://github.com/iqiyi/xCrash/issues)
+* [GitHub Discussions](https://github.com/iqiyi/xCrash/discussions)
+* Email: <a href="mailto:caikelun@gmail.com">caikelun@gmail.com</a>, <a href="mailto:xuqnqn@qq.com">xuqnqn@qq.com</a>
 
 
 ## 贡献

src/java/xcrash/build.gradle → build.gradle

@@ -1,19 +1,21 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
-        classpath 'digital.wup:android-maven-publish:3.6.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+//      mavenLocal()
+        mavenCentral()
+        maven {url "https://s01.oss.sonatype.org/content/groups/public"}
+        maven {url "https://s01.oss.sonatype.org/content/repositories/releases"}
     }
 }
 
@@ -22,20 +24,24 @@ task clean(type: Delete) {
 }
 
 ext {
-    minSdkVersion = 14
-    compileSdkVersion = 29
-    targetSdkVersion = 29
-    buildToolsVersion = '29.0.2'
-    javaVersion = JavaVersion.VERSION_1_6
+    minSdkVersion = 16
+    compileSdkVersion = 31
+    targetSdkVersion = 31
+    buildToolsVersion = '30.0.2'
+    javaVersion = JavaVersion.VERSION_1_8
+    ndkVersion = "21.3.6528147"
+    cmakeVersion = "3.10.2"
+    abiFilters = "armeabi-v7a,arm64-v8a,x86,x86_64"
+    useASAN = false
 
     POM_GROUP_ID = "com.iqiyi.xcrash"
     POM_ARTIFACT_ID = "xcrash-android-lib"
-    POM_VERSION_NAME = "2.4.8"
+    POM_VERSION_NAME = "3.1.0"
 
     POM_NAME = "xCrash Android Lib"
     POM_DESCRIPTION = "xCrash provides the Android app with the ability to capture java crash, native crash and ANR."
     POM_URL = "https://github.com/iqiyi/xCrash"
-    POM_INCEPTION_YEAR = "2019"
+    POM_INCEPTION_YEAR = "2020"
     POM_PACKAGING = "aar"
 
     POM_SCM_CONNECTION = "https://github.com/iqiyi/xCrash.git"
@@ -49,8 +55,4 @@ ext {
 
     POM_DEVELOPER_ID = "iQIYI"
     POM_DEVELOPER_NAME = "iQIYI, Inc."
-
-    BINTRAY_REPO = "maven"
-    BINTRAY_ORGANIZATION = "xcrash"
-    BINTRAY_LICENCE = ['MIT']
 }