1. Update xDL to v1.0.4.

2. Switch from JCenter to Maven Central.
3. Change maven groupId:artifactId to io.hexhacking:xunwind.

Author: caikelun

README.md

@@ -2,7 +2,7 @@
 
 ![](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-1.0.0-red.svg?style=flat)
+![](https://img.shields.io/badge/release-1.0.2-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2011-blue.svg?style=flat)
 ![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
@@ -35,11 +35,17 @@ xUnwind is a collection of Android native stack unwinding solutions.
 
 ## Usage
 
-xUnwind uses [Prefab](https://google.github.io/prefab/) package format, which is supported by Android Gradle Plugin 4.0+.
+### 1. Add dependency in build.gradle
 
-More information: [Using native dependencies](https://developer.android.com/studio/build/native-dependencies)
+xUnwind is published on [Maven Central](https://search.maven.org/), and uses [Prefab](https://google.github.io/prefab/) package format for [native dependencies](https://developer.android.com/studio/build/native-dependencies), which is supported by [Android Gradle Plugin 4.0+](https://developer.android.com/studio/releases/gradle-plugin?buildsystem=cmake#native-dependencies).
 
-### 1. Add dependency in build.gradle
+```Gradle
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
 
 ```Gradle
 android {
@@ -49,7 +55,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking.xunwind:xunwind-android-lib:1.0.0'
+    implementation 'io.hexhacking:xunwind:1.0.2'
 }
 ```
 

README.zh-CN.md

@@ -2,7 +2,7 @@
 
 ![](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-1.0.0-red.svg?style=flat)
+![](https://img.shields.io/badge/release-1.0.2-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2011-blue.svg?style=flat)
 ![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
@@ -35,11 +35,17 @@ xUnwind 是一个安卓 native 栈回溯方案的集合。
 
 ## 使用
 
-xUnwind 使用从 Android Gradle Plugin 4.0+ 开始支持的 [Prefab](https://google.github.io/prefab/) 包格式。
+### 1. 在 build.gradle 中增加依赖
 
-更多信息: [使用 native 依赖项](https://developer.android.com/studio/build/native-dependencies)
+xUnwind 发布在 [Maven Central](https://search.maven.org/) 上。为了使用 [native 依赖项](https://developer.android.com/studio/build/native-dependencies)，xUnwind 使用了从 [Android Gradle Plugin 4.0+](https://developer.android.com/studio/releases/gradle-plugin?buildsystem=cmake#native-dependencies) 开始支持的 [Prefab](https://google.github.io/prefab/) 包格式。
 
-### 1. 在 build.gradle 中增加依赖
+```Gradle
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+```
 
 ```Gradle
 android {
@@ -49,7 +55,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking.xunwind:xunwind-android-lib:1.0.0'
+    implementation 'io.hexhacking:xunwind:1.0.2'
 }
 ```
 

build.gradle

@@ -5,14 +5,14 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.2"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
 allprojects {
     repositories {
 //        mavenLocal()
         google()
+        mavenCentral()
         jcenter()
     }
 }
@@ -32,9 +32,9 @@ ext {
     abiFilters = "armeabi-v7a,arm64-v8a,x86,x86_64"
     useASAN = false
 
-    POM_GROUP_ID = "io.hexhacking.xunwind"
-    POM_ARTIFACT_ID = "xunwind-android-lib"
-    POM_VERSION_NAME = "1.0.0"
+    POM_GROUP_ID = "io.hexhacking"
+    POM_ARTIFACT_ID = "xunwind"
+    POM_VERSION_NAME = "1.0.2"
 
     POM_NAME = "xUnwind Android Lib"
     POM_DESCRIPTION = "xUnwind is a collection of Android native stack unwinding solutions."
@@ -53,8 +53,4 @@ ext {
 
     POM_DEVELOPER_ID = "HexHacking"
     POM_DEVELOPER_NAME = "HexHacking Team"
-
-    BINTRAY_REPO = "maven"
-    BINTRAY_ORGANIZATION = "hexhacking"
-    BINTRAY_LICENCE = ['MIT']
 }

gradle/publish.gradle

@@ -1,22 +1,25 @@
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'signing'
 
-def readPropertyFromLocalProperties(String key) {
-    Properties properties = new Properties()
-    try {
-        properties.load(project.rootProject.file('local.properties').newDataInputStream())
-    } catch (Exception e) {
-        println("load local.properties failed. msg: ${e.message}")
-    }
-    return properties.getProperty(key)
-}
-
-def getBintrayUser() {
-    return readPropertyFromLocalProperties('BINTRAY_USER')
-}
+ext["signing.keyId"] = ''
+ext["signing.password"] = ''
+ext["signing.secretKeyRingFile"] = ''
+ext["ossrhUsername"] = ''
+ext["ossrhPassword"] = ''
 
-def getBintrayApikey() {
-    return readPropertyFromLocalProperties('BINTRAY_APIKEY')
+File secretPropsFile = project.rootProject.file('local.properties')
+if (secretPropsFile.exists()) {
+    Properties p = new Properties()
+    p.load(new FileInputStream(secretPropsFile))
+    p.each { name, value ->
+        ext[name] = value
+    }
+} else {
+    ext["signing.keyId"] = System.getenv('SIGNING_KEY_ID')
+    ext["signing.password"] = System.getenv('SIGNING_PASSWORD')
+    ext["signing.secretKeyRingFile"] = System.getenv('SIGNING_SECRET_KEY_RING_FILE')
+    ext["ossrhUsername"] = System.getenv('OSSRH_USERNAME')
+    ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD')
 }
 
 task sourcesJar(type: Jar) {
@@ -35,73 +38,65 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 project.afterEvaluate {
-    publishing.publications {
-        mavenAar(MavenPublication) {
-            from components.release
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
 
-            artifact sourcesJar
-            artifact javadocJar
+                artifact sourcesJar
+                artifact javadocJar
 
-            artifactId POM_ARTIFACT_ID
-            groupId POM_GROUP_ID
-            version POM_VERSION_NAME
+                artifactId POM_ARTIFACT_ID
+                groupId POM_GROUP_ID
+                version POM_VERSION_NAME
 
-            pom {
-                name = POM_NAME
-                description = POM_DESCRIPTION
-                url = POM_URL
-                inceptionYear = POM_INCEPTION_YEAR
-                packaging = POM_PACKAGING
-                scm {
-                    connection = POM_SCM_CONNECTION
+                pom {
+                    name = POM_NAME
+                    description = POM_DESCRIPTION
                     url = POM_URL
-                }
-                issueManagement {
-                    system = POM_ISSUE_SYSTEM
-                    url = POM_ISSUE_URL
-                }
-                licenses {
-                    license {
-                        name = POM_LICENCE_NAME
-                        url = POM_LICENCE_URL
-                        distribution = POM_LICENCE_DIST
+                    inceptionYear = POM_INCEPTION_YEAR
+                    packaging = POM_PACKAGING
+                    scm {
+                        connection = POM_SCM_CONNECTION
+                        url = POM_URL
                     }
-                }
-                developers {
-                    developer {
-                        id = POM_DEVELOPER_ID
-                        name = POM_DEVELOPER_NAME
+                    issueManagement {
+                        system = POM_ISSUE_SYSTEM
+                        url = POM_ISSUE_URL
+                    }
+                    licenses {
+                        license {
+                            name = POM_LICENCE_NAME
+                            url = POM_LICENCE_URL
+                            distribution = POM_LICENCE_DIST
+                        }
+                    }
+                    developers {
+                        developer {
+                            id = POM_DEVELOPER_ID
+                            name = POM_DEVELOPER_NAME
+                        }
                     }
                 }
             }
         }
-    }
-}
+        repositories {
+            maven {
+                name = "sonatype"
 
-bintray {
-    user = getBintrayUser()
-    key = getBintrayApikey()
-    publications = ['mavenAar']
-    pkg {
-        repo = BINTRAY_REPO
-        name = "${POM_GROUP_ID}:${POM_ARTIFACT_ID}"
-        userOrg = BINTRAY_ORGANIZATION
-        desc = POM_DESCRIPTION
-        websiteUrl = POM_URL
-        issueTrackerUrl = POM_ISSUE_URL
-        vcsUrl = POM_SCM_CONNECTION
-        licenses = BINTRAY_LICENCE
-        publicDownloadNumbers = true
-        publish = true
-        dryRun = false
+                def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
 
-        version {
-            name = POM_VERSION_NAME
-            released = new Date()
-            vcsTag = POM_VERSION_NAME
-            gpg {
-                sign = true
+                credentials {
+                    username ossrhUsername
+                    password ossrhPassword
+                }
             }
         }
     }
 }
+
+signing {
+    sign publishing.publications
+}

xunwind/build.gradle

@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking.xdl:xdl-android-lib:1.0.2'
+    implementation 'io.hexhacking:xdl:1.0.4'
 }
 
 apply from: rootProject.file('gradle/check.gradle')

xunwind/src/main/cpp/include/xunwind.h

@@ -22,7 +22,7 @@
 // Created by caikelun on 2020-10-21.
 
 //
-// xUnwind version: 1.0.0
+// xUnwind version: 1.0.2
 //
 // You can always get the latest version from:
 // https://github.com/hexhacking/xUnwind

xunwind/src/main/cpp/xu_libcorkscrew.c

@@ -122,7 +122,7 @@ int xu_libcorkscrew_init(void)
     ret = 0;
 
  end:
-    dlclose(handle);
+    //dlclose(handle);
     return ret;
 }
 

xunwind/src/main/cpp/xunwind.c

@@ -41,17 +41,6 @@
 #include "xu_log.h"
 #include "xdl.h"
 
-__attribute__((constructor)) static void xunwind_init(void)
-{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
-#define LOG(fmt, ...) __android_log_print(ANDROID_LOG_INFO, "xunwind", fmt, ##__VA_ARGS__)
-#pragma clang diagnostic pop
-
-    if(0 != xu_cfi_init()) LOG("CFI init FAILED");
-    if(0 != xu_fp_init()) LOG("FP init FAILED");
-}
-
 void xunwind_cfi_log(pid_t pid, pid_t tid, void *context, const char *logtag, android_LogPriority priority, const char *prefix)
 {
     if(priority < ANDROID_LOG_VERBOSE || ANDROID_LOG_FATAL < priority) return;

xunwind/src/main/cpp/xunwind_ctor.c

@@ -0,0 +1,37 @@
+// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+//
+// 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:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+// Created by caikelun on 2020-10-21.
+
+#include <android/log.h>
+#include "xu_cfi.h"
+#include "xu_fp.h"
+
+__attribute__((constructor)) static void xunwind_init(void)
+{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#define LOG(fmt, ...) __android_log_print(ANDROID_LOG_INFO, "xunwind", fmt, ##__VA_ARGS__)
+#pragma clang diagnostic pop
+
+    if(0 != xu_cfi_init()) LOG("CFI init FAILED");
+    if(0 != xu_fp_init()) LOG("FP init FAILED");
+}

xunwind_sample/build.gradle

@@ -42,11 +42,11 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
     implementation project(':xunwind')
-//    implementation 'io.hexhacking.xunwind:xunwind-android-lib:1.0.0'
+//    implementation 'io.hexhacking:xunwind:1.0.2'
 }
 
 apply from: rootProject.file('gradle/sanitizer.gradle')