Upgrade version for gradle, NDK, xDL. Correct the format of copyright…

… information.
hexhacking · Dec 27, 2021 · 4b682d0 · 4b682d0
1 parent 9527aa5
commit 4b682d0
Show file tree

Hide file tree

Showing 34 changed files with 61 additions and 435 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+Copyright (c) 2020-2021 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

diff --git a/LICENSE-docs b/LICENSE-docs
diff --git a/README.md b/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.3-red.svg?style=flat)
+![](https://img.shields.io/badge/release-1.1.0-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2012-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)
 
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking:xunwind:1.0.3'
+    implementation 'io.hexhacking:xunwind:1.1.0'
 }
 ```
 
@@ -238,8 +238,6 @@ FP and EH unwinding do not have corresponding java functions. Because compared t
 
 xUnwind is MIT licensed, as found in the [LICENSE](LICENSE) file.
 
-xUnwind documentation is Creative Commons licensed, as found in the [LICENSE-docs](LICENSE-docs) file.
-
 
 ## History
 

diff --git a/README.zh-CN.md b/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.3-red.svg?style=flat)
+![](https://img.shields.io/badge/release-1.1.0-red.svg?style=flat)
 ![](https://img.shields.io/badge/Android-4.1%20--%2012-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)
 
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking:xunwind:1.0.3'
+    implementation 'io.hexhacking:xunwind:1.1.0'
 }
 ```
 
@@ -238,8 +238,6 @@ FP 和 EH 栈回溯没有对应的 java 函数。因为相对于 CFI 栈回溯
 
 xUnwind 使用 [MIT 许可证](LICENSE)。
 
-xUnwind 的文档使用 [Creative Commons 许可证](LICENSE-docs)。
-
 
 ## 历史
 

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.4'
     }
 }
 
@@ -26,15 +26,15 @@ ext {
     targetSdkVersion = 31
     buildToolsVersion = '31.0.0'
     javaVersion = JavaVersion.VERSION_1_7
-    ndkVersion = "22.1.7171670"
+    ndkVersion = "23.1.7779620"
     cmakeVersion = "3.18.1"
     abiFilters = "armeabi-v7a,arm64-v8a,x86,x86_64"
     useASAN = false
     dependencyOnLocalLibrary = true
 
     POM_GROUP_ID = "io.hexhacking"
     POM_ARTIFACT_ID = "xunwind"
-    POM_VERSION_NAME = "1.0.3"
+    POM_VERSION_NAME = "1.1.0"
 
     POM_NAME = "xUnwind Android Lib"
     POM_DESCRIPTION = "xUnwind is a collection of Android native stack unwinding solutions."

diff --git a/xunwind/build.gradle b/xunwind/build.gradle
@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-    implementation 'io.hexhacking:xdl:1.1.1'
+    implementation 'io.hexhacking:xdl:1.1.2'
 }
 
 apply from: rootProject.file('gradle/check.gradle')

diff --git a/xunwind/src/main/cpp/CMakeLists.txt b/xunwind/src/main/cpp/CMakeLists.txt
@@ -14,6 +14,6 @@ if(USEASAN)
 target_compile_options(xunwind PUBLIC -fsanitize=address -fno-omit-frame-pointer)
 target_link_options(xunwind PUBLIC -fsanitize=address)
 else()
-target_compile_options(xunwind PUBLIC -Oz -flto -ffunction-sections -fdata-sections)
-target_link_options(xunwind PUBLIC -Oz -flto -Wl,--exclude-libs,ALL -Wl,--gc-sections -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/xunwind.map.txt)
+target_compile_options(xunwind PUBLIC -Oz -flto -faddrsig -ffunction-sections -fdata-sections)
+target_link_options(xunwind PUBLIC -Oz -flto -Wl,--icf=all -Wl,-mllvm,--enable-machine-outliner=always -Wl,--exclude-libs,ALL -Wl,--gc-sections -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/xunwind.map.txt)
 endif()
diff --git a/xunwind/src/main/cpp/include/xunwind.h b/xunwind/src/main/cpp/include/xunwind.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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
@@ -22,7 +22,7 @@
 // Created by caikelun on 2020-10-21.
 
 //
-// xUnwind version: 1.0.3
+// xUnwind version: 1.1.0
 //
 // xUnwind is a collection of Android native stack unwinding solutions.
 // For more information, documentation, and the latest version please check:

diff --git a/xunwind/src/main/cpp/xu_cfi.c b/xunwind/src/main/cpp/xu_cfi.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_cfi.h b/xunwind/src/main/cpp/xu_cfi.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_config.h b/xunwind/src/main/cpp/xu_config.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_eh.c b/xunwind/src/main/cpp/xu_eh.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_eh.h b/xunwind/src/main/cpp/xu_eh.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_formatter.c b/xunwind/src/main/cpp/xu_formatter.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_formatter.h b/xunwind/src/main/cpp/xu_formatter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_fp.h b/xunwind/src/main/cpp/xu_fp.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_fp_arm64.c b/xunwind/src/main/cpp/xu_fp_arm64.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_fp_unimplemented.c b/xunwind/src/main/cpp/xu_fp_unimplemented.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_jni.c b/xunwind/src/main/cpp/xu_jni.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_libbacktrace.c b/xunwind/src/main/cpp/xu_libbacktrace.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_libbacktrace.h b/xunwind/src/main/cpp/xu_libbacktrace.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_libcorkscrew.c b/xunwind/src/main/cpp/xu_libcorkscrew.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_libcorkscrew.h b/xunwind/src/main/cpp/xu_libcorkscrew.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_libcxx.c b/xunwind/src/main/cpp/xu_libcxx.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_libcxx.h b/xunwind/src/main/cpp/xu_libcxx.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_log.h b/xunwind/src/main/cpp/xu_log.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_printer.c b/xunwind/src/main/cpp/xu_printer.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_printer.h b/xunwind/src/main/cpp/xu_printer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_util.c b/xunwind/src/main/cpp/xu_util.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xu_util.h b/xunwind/src/main/cpp/xu_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xunwind.c b/xunwind/src/main/cpp/xunwind.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/cpp/xunwind_ctor.c b/xunwind/src/main/cpp/xunwind_ctor.c
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
+// Copyright (c) 2020-2021 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

diff --git a/xunwind/src/main/java/io/hexhacking/xunwind/XUnwind.java b/xunwind/src/main/java/io/hexhacking/xunwind/XUnwind.java
@@ -1,3 +1,26 @@
+// Copyright (c) 2020-2021 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
+// 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.
+
 package io.hexhacking.xunwind;
 
 public class XUnwind {

diff --git a/xunwind_sample/build.gradle b/xunwind_sample/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     if (rootProject.ext.dependencyOnLocalLibrary) {
         implementation project(':xunwind')
     } else {
-        implementation 'io.hexhacking:xunwind:1.0.3'
+        implementation 'io.hexhacking:xunwind:1.1.0'
     }
 }