Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	build.gradle.kts
This commit is contained in:
Lucaskyy 2022-06-22 16:25:53 +02:00
commit 8a49dcc110
No known key found for this signature in database
GPG Key ID: 1530BFF96D1EEB89
3 changed files with 29 additions and 2 deletions

View File

@ -1,3 +1,30 @@
## [1.9.3](https://github.com/revanced/revanced-cli/compare/v1.9.2...v1.9.3) (2022-06-22)
### Bug Fixes
* use absolute file path for key store ([d335846](https://github.com/revanced/revanced-cli/commit/d335846202b991e130882e9ce0ab268deb2e27ab))
## [1.9.2](https://github.com/revanced/revanced-cli/compare/v1.9.1...v1.9.2) (2022-06-22)
### Bug Fixes
* update patcher version ([0df936e](https://github.com/revanced/revanced-cli/commit/0df936e99b01358a88a628af63eebb5ac92cae76))
## [1.9.1](https://github.com/revanced/revanced-cli/compare/v1.9.0...v1.9.1) (2022-06-22)
### Bug Fixes
* add back in: option to specify keystore file path ([c94471f](https://github.com/revanced/revanced-cli/commit/c94471f4643e44b2b472ff0d826db0d2743bdc86))
* remove logger from Signer.kt ([51e091c](https://github.com/revanced/revanced-cli/commit/51e091ce4021418508044029aa5af6aa7d5162a3))
### Reverts
* "feat: use of `java.util.logging.Logger`" ([2c8a106](https://github.com/revanced/revanced-cli/commit/2c8a10615192635202ddc137fc02f175c5914d8f))
# [1.9.0](https://github.com/revanced/revanced-cli/compare/v1.8.0...v1.9.0) (2022-06-22) # [1.9.0](https://github.com/revanced/revanced-cli/compare/v1.8.0...v1.9.0) (2022-06-22)

View File

@ -1,2 +1,2 @@
kotlin.code.style = official kotlin.code.style = official
version = 1.9.0 version = 1.9.3

View File

@ -117,7 +117,7 @@ internal object MainCommand : Runnable {
SigningOptions( SigningOptions(
args.cn, args.cn,
args.password, args.password,
args.keystorePath ?: outputFile.parentFile args.keystorePath ?: outputFile.absoluteFile.parentFile
.resolve("${outputFile.nameWithoutExtension}.keystore") .resolve("${outputFile.nameWithoutExtension}.keystore")
.name .name
) )