xUnwind version upgrade to 2.0.0.

Author: caikelun

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 HexHacking Team
+Copyright (c) 2020-2023 HexHacking Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.1.1-red.svg?style=flat)
+![](https://img.shields.io/badge/release-2.0.0-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2013-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)
 
@@ -39,14 +39,6 @@ xUnwind is a collection of Android native stack unwinding solutions.
 
 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).
 
-```Gradle
-allprojects {
-    repositories {
-        mavenCentral()
-    }
-}
-```
-
 ```Gradle
 android {
     buildFeatures {
@@ -55,10 +47,25 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking:xunwind:1.1.1'
+    implementation 'io.github.hexhacking:xunwind:2.0.0'
 }
 ```
 
+**NOTE**:
+
+1. Starting from version `2.0.0` of xUnwind, group ID changed from `io.hexhacking` to `io.github.hexhacking`.
+
+| version range  | group ID                 | artifact ID | Repository URL |
+|:---------------|:-------------------------|:------------| :--------------|
+| [1.0.1, 1.1.1] | io.hexhacking            | xunwind     | [repo](https://repo1.maven.org/maven2/io/hexhacking/xunwind/) |
+| [2.0.0, )      | **io.github.hexhacking** | xunwind     | [repo](https://repo1.maven.org/maven2/io/github/hexhacking/xunwind/) |
+
+2. xUnwind uses the [prefab package schema v2](https://github.com/google/prefab/releases/tag/v2.0.0), which is configured by default since [Android Gradle Plugin 7.1.0](https://developer.android.com/studio/releases/gradle-plugin?buildsystem=cmake#7-1-0). If you are using Android Gradle Plugin earlier than 7.1.0, please add the following configuration to `gradle.properties`:
+
+```
+android.prefabVersion=2.0.0
+```
+
 ### 2. Add dependency in CMakeLists.txt or Android.mk
 
 If you only use the java interface of xUnwind, please skip this step.
@@ -176,7 +183,7 @@ The remaining three functions are used to convert the absolute-PCs in the `frame
 ## Java API
 
 ```Java
-import io.hexhacking.xunwind.XUnwind;
+import io.github.hexhacking.xunwind.XUnwind;
 ```
 
 ### 1. Initialize

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.1.1-red.svg?style=flat)
+![](https://img.shields.io/badge/release-2.0.0-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2013-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)
 
@@ -39,14 +39,6 @@ xUnwind 是一个安卓 native 栈回溯方案的集合。
 
 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/) 包格式。
 
-```Gradle
-allprojects {
-    repositories {
-        mavenCentral()
-    }
-}
-```
-
 ```Gradle
 android {
     buildFeatures {
@@ -55,10 +47,25 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking:xunwind:1.1.1'
+    implementation 'io.github.hexhacking:xunwind:2.0.0'
 }
 ```
 
+**注意**：
+
+1. xUnwind 从版本 `2.0.0` 开始，group ID 从 `io.hexhacking` 改为 `io.github.hexhacking`。
+
+| 版本号范围          | group ID                 | artifact ID | 仓库 URL |
+|:---------------|:-------------------------|:------------|:----------------------------------------------------------|
+| [1.0.1, 1.1.1] | io.hexhacking            | xunwind     | [repo](https://repo1.maven.org/maven2/io/hexhacking/xunwind/) |
+| [2.0.0, )      | **io.github.hexhacking** | xunwind     | [repo](https://repo1.maven.org/maven2/io/github/hexhacking/xunwind/) |
+
+2. xUnwind 使用 [prefab package schema v2](https://github.com/google/prefab/releases/tag/v2.0.0)，它是从 [Android Gradle Plugin 7.1.0](https://developer.android.com/studio/releases/gradle-plugin?buildsystem=cmake#7-1-0) 开始作为默认配置的。如果你使用的是 Android Gradle Plugin 7.1.0 之前的版本，请在 `gradle.properties` 中加入以下配置：
+
+```
+android.prefabVersion=2.0.0
+```
+
 ### 2. 在 CMakeLists.txt 或 Android.mk 中增加依赖
 
 如果你只使用 xUnwind 的 java 接口，请跳过这一步。
@@ -176,7 +183,7 @@ char *xunwind_frames_get(uintptr_t* frames, size_t frames_sz, const char *prefix
 ## Java API
 
 ```Java
-import io.hexhacking.xunwind.XUnwind;
+import io.github.hexhacking.xunwind.XUnwind;
 ```
 
 ### 1. 初始化

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'com.android.application' version '7.2.2' apply false
-    id 'com.android.library' version '7.2.2' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
 }
 
 task clean(type: Delete) {
@@ -11,17 +11,18 @@ ext {
     minSdkVersion = 16
     compileSdkVersion = 33
     targetSdkVersion = 33
-    buildToolsVersion = '33.0.0'
+    buildToolsVersion = '33.0.2'
     javaVersion = JavaVersion.VERSION_1_7
     ndkVersion = "23.2.8568313"
     cmakeVersion = "3.22.1"
     abiFilters = "armeabi-v7a,arm64-v8a,x86,x86_64"
     useASAN = false
     dependencyOnLocalLibrary = true
+    xunwindVersion = "2.0.0"
 
-    POM_GROUP_ID = "io.hexhacking"
+    POM_GROUP_ID = "io.github.hexhacking"
     POM_ARTIFACT_ID = "xunwind"
-    POM_VERSION_NAME = "1.1.1"
+    POM_VERSION_NAME = "2.0.0"
 
     POM_NAME = "xUnwind Android Lib"
     POM_DESCRIPTION = "xUnwind is a collection of Android native stack unwinding solutions."

gradle.properties

@@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true
+android.disableAutomaticComponentCreation=true

gradle/publish.gradle

@@ -22,32 +22,14 @@ if (secretPropsFile.exists()) {
     ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD')
 }
 
-task sourcesJar(type: Jar) {
-    archiveClassifier.set("sources")
-    from android.sourceSets.main.java.srcDirs
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set("javadoc")
-    from javadoc.destinationDir
-}
-
 project.afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
                 from components.release
 
-                artifact sourcesJar
-                artifact javadocJar
-
-                artifactId POM_ARTIFACT_ID
                 groupId POM_GROUP_ID
+                artifactId POM_ARTIFACT_ID
                 version POM_VERSION_NAME
 
                 pom {
@@ -84,9 +66,9 @@ project.afterEvaluate {
             maven {
                 name = "sonatype"
 
-                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
+                def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+                def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                url = POM_VERSION_NAME.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
 
                 credentials {
                     username ossrhUsername

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Aug 29 19:39:58 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
     }
 }
 rootProject.name = "xUnwind"

xunwind/build.gradle

@@ -1,6 +1,9 @@
-apply plugin: 'com.android.library'
+plugins {
+    id 'com.android.library'
+}
 
 android {
+    namespace 'io.github.hexhacking.xunwind'
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     ndkVersion rootProject.ext.ndkVersion
@@ -40,6 +43,7 @@ android {
     buildFeatures {
         prefab true
         prefabPublishing true
+        buildConfig false
     }
     prefab {
         xunwind {
@@ -49,10 +53,16 @@ android {
     packagingOptions {
         exclude '**/libxdl.so'
     }
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
 }
 
 dependencies {
-    implementation 'io.hexhacking:xdl:1.1.5'
+    implementation 'io.github.hexhacking:xdl:2.0.0'
 }
 
 apply from: rootProject.file('gradle/check.gradle')

xunwind/consumer-rules.pro

@@ -1,3 +1,3 @@
--keep class io.hexhacking.xunwind.XUnwind {
+-keep class io.github.hexhacking.xunwind.XUnwind {
     native <methods>;
 }