Skip to content

Commit 4b682d0

Browse files
committed
Upgrade version for gradle, NDK, xDL. Correct the format of copyright information.
1 parent 9527aa5 commit 4b682d0

34 files changed

Lines changed: 61 additions & 435 deletions

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2020-present, HexHacking Team. All rights reserved.
3+
Copyright (c) 2020-2021 HexHacking Team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

LICENSE-docs

Lines changed: 0 additions & 393 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
44
![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
5-
![](https://img.shields.io/badge/release-1.0.3-red.svg?style=flat)
5+
![](https://img.shields.io/badge/release-1.1.0-red.svg?style=flat)
66
![](https://img.shields.io/badge/Android-4.1%20--%2012-blue.svg?style=flat)
77
![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
88

@@ -55,7 +55,7 @@ android {
5555
}
5656
5757
dependencies {
58-
implementation 'io.hexhacking:xunwind:1.0.3'
58+
implementation 'io.hexhacking:xunwind:1.1.0'
5959
}
6060
```
6161

@@ -238,8 +238,6 @@ FP and EH unwinding do not have corresponding java functions. Because compared t
238238

239239
xUnwind is MIT licensed, as found in the [LICENSE](LICENSE) file.
240240

241-
xUnwind documentation is Creative Commons licensed, as found in the [LICENSE-docs](LICENSE-docs) file.
242-
243241

244242
## History
245243

README.zh-CN.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
44
![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
5-
![](https://img.shields.io/badge/release-1.0.3-red.svg?style=flat)
5+
![](https://img.shields.io/badge/release-1.1.0-red.svg?style=flat)
66
![](https://img.shields.io/badge/Android-4.1%20--%2012-blue.svg?style=flat)
77
![](https://img.shields.io/badge/arch-armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
88

@@ -55,7 +55,7 @@ android {
5555
}
5656
5757
dependencies {
58-
implementation 'io.hexhacking:xunwind:1.0.3'
58+
implementation 'io.hexhacking:xunwind:1.1.0'
5959
}
6060
```
6161

@@ -238,8 +238,6 @@ FP 和 EH 栈回溯没有对应的 java 函数。因为相对于 CFI 栈回溯
238238

239239
xUnwind 使用 [MIT 许可证](LICENSE)
240240

241-
xUnwind 的文档使用 [Creative Commons 许可证](LICENSE-docs)
242-
243241

244242
## 历史
245243

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:7.0.0'
7+
classpath 'com.android.tools.build:gradle:7.0.4'
88
}
99
}
1010

@@ -26,15 +26,15 @@ ext {
2626
targetSdkVersion = 31
2727
buildToolsVersion = '31.0.0'
2828
javaVersion = JavaVersion.VERSION_1_7
29-
ndkVersion = "22.1.7171670"
29+
ndkVersion = "23.1.7779620"
3030
cmakeVersion = "3.18.1"
3131
abiFilters = "armeabi-v7a,arm64-v8a,x86,x86_64"
3232
useASAN = false
3333
dependencyOnLocalLibrary = true
3434

3535
POM_GROUP_ID = "io.hexhacking"
3636
POM_ARTIFACT_ID = "xunwind"
37-
POM_VERSION_NAME = "1.0.3"
37+
POM_VERSION_NAME = "1.1.0"
3838

3939
POM_NAME = "xUnwind Android Lib"
4040
POM_DESCRIPTION = "xUnwind is a collection of Android native stack unwinding solutions."

xunwind/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
}
5252

5353
dependencies {
54-
implementation 'io.hexhacking:xdl:1.1.1'
54+
implementation 'io.hexhacking:xdl:1.1.2'
5555
}
5656

5757
apply from: rootProject.file('gradle/check.gradle')

xunwind/src/main/cpp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ if(USEASAN)
1414
target_compile_options(xunwind PUBLIC -fsanitize=address -fno-omit-frame-pointer)
1515
target_link_options(xunwind PUBLIC -fsanitize=address)
1616
else()
17-
target_compile_options(xunwind PUBLIC -Oz -flto -ffunction-sections -fdata-sections)
18-
target_link_options(xunwind PUBLIC -Oz -flto -Wl,--exclude-libs,ALL -Wl,--gc-sections -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/xunwind.map.txt)
17+
target_compile_options(xunwind PUBLIC -Oz -flto -faddrsig -ffunction-sections -fdata-sections)
18+
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)
1919
endif()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
1+
// Copyright (c) 2020-2021 HexHacking Team
22
//
33
// Permission is hereby granted, free of charge, to any person obtaining a copy
44
// of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
2222
// Created by caikelun on 2020-10-21.
2323

2424
//
25-
// xUnwind version: 1.0.3
25+
// xUnwind version: 1.1.0
2626
//
2727
// xUnwind is a collection of Android native stack unwinding solutions.
2828
// For more information, documentation, and the latest version please check:

xunwind/src/main/cpp/xu_cfi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
1+
// Copyright (c) 2020-2021 HexHacking Team
22
//
33
// Permission is hereby granted, free of charge, to any person obtaining a copy
44
// of this software and associated documentation files (the "Software"), to deal

xunwind/src/main/cpp/xu_cfi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020-present, HexHacking Team. All rights reserved.
1+
// Copyright (c) 2020-2021 HexHacking Team
22
//
33
// Permission is hereby granted, free of charge, to any person obtaining a copy
44
// of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)