Compare commits

..

10 Commits

Author SHA1 Message Date
semantic-release-bot
6c6abafe95 chore(release): 1.4.0 [skip ci]
# [1.4.0](https://github.com/revanced/revanced-cli/compare/v1.3.3...v1.4.0) (2022-06-14)

### Features

* chcon on mount ([e1c7d10](e1c7d1082a))
2022-06-14 13:31:37 +00:00
Kinsteen
e1c7d1082a feat: chcon on mount
Co-authored-by: PaulF <paul.francon@pi.esisar.grenoble-inp.fr>
Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
2022-06-14 15:30:14 +02:00
semantic-release-bot
7444e4e67d chore(release): 1.3.3 [skip ci]
## [1.3.3](https://github.com/revanced/revanced-cli/compare/v1.3.2...v1.3.3) (2022-06-13)

### Bug Fixes

* missing implementation ([48102c6](48102c6607))
2022-06-13 23:24:05 +00:00
Sculas
48102c6607 fix: missing implementation 2022-06-14 01:22:48 +02:00
Sculas
70258e251c chore: use Kotlin plugin for dependencies 2022-06-14 01:21:29 +02:00
semantic-release-bot
836892df7b chore(release): 1.3.2 [skip ci]
## [1.3.2](https://github.com/revanced/revanced-cli/compare/v1.3.1...v1.3.2) (2022-06-13)

### Bug Fixes

* only upload `-all.jar` asset ([ca8e1ba](ca8e1ba6af))
2022-06-13 23:19:28 +00:00
oSumAtrIX
ca8e1ba6af fix: only upload -all.jar asset 2022-06-14 01:18:15 +02:00
semantic-release-bot
00e9e53df6 chore(release): 1.3.1 [skip ci]
## [1.3.1](https://github.com/revanced/revanced-cli/compare/v1.3.0...v1.3.1) (2022-06-13)

### Bug Fixes

* check if `packageVersion` is compatible with any from `compatiblePackages` ([32589c8](32589c88e4))
2022-06-13 23:14:04 +00:00
oSumAtrIX
cdc4e9c8ac chore: publish releases instead of packages 2022-06-14 01:11:54 +02:00
oSumAtrIX
32589c88e4 fix: check if packageVersion is compatible with any from compatiblePackages 2022-06-13 01:59:39 +02:00
5 changed files with 61 additions and 42 deletions

View File

@@ -10,7 +10,6 @@
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
"gradle-semantic-release-plugin",
[
"@semantic-release/git",
{
@@ -20,6 +19,15 @@
]
}
],
"@semantic-release/github"
[
"@semantic-release/github",
{
"assets": [
{
"path": "build/libs/*all.jar"
}
]
}
]
]
}
}

View File

@@ -1,3 +1,31 @@
# [1.4.0](https://github.com/revanced/revanced-cli/compare/v1.3.3...v1.4.0) (2022-06-14)
### Features
* chcon on mount ([e1c7d10](https://github.com/revanced/revanced-cli/commit/e1c7d1082a6946d1082c8744a1d0118c1a2263ea))
## [1.3.3](https://github.com/revanced/revanced-cli/compare/v1.3.2...v1.3.3) (2022-06-13)
### Bug Fixes
* missing implementation ([48102c6](https://github.com/revanced/revanced-cli/commit/48102c66077c4ae17e3de1076e9da72de5f00366))
## [1.3.2](https://github.com/revanced/revanced-cli/compare/v1.3.1...v1.3.2) (2022-06-13)
### Bug Fixes
* only upload `-all.jar` asset ([ca8e1ba](https://github.com/revanced/revanced-cli/commit/ca8e1ba6af00e275c6981476f773b13b103799d1))
## [1.3.1](https://github.com/revanced/revanced-cli/compare/v1.3.0...v1.3.1) (2022-06-13)
### Bug Fixes
* check if `packageVersion` is compatible with any from `compatiblePackages` ([32589c8](https://github.com/revanced/revanced-cli/commit/32589c88e438e0a1375c256e9bb8a93f5a4d319b))
# [1.3.0](https://github.com/revanced/revanced-cli/compare/v1.2.0...v1.3.0) (2022-06-11)

View File

@@ -1,42 +1,41 @@
plugins {
kotlin("jvm") version "1.6.21"
kotlin("jvm") version "1.7.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
java
`maven-publish`
}
group = "app.revanced"
val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
repositories {
mavenCentral()
google()
mavenLocal()
maven {
url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
credentials {
username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
username = githubUsername
password = githubPassword
}
}
maven {
url = uri("https://jitpack.io")
url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
credentials {
username = githubUsername
password = githubPassword
}
}
maven { url = uri("https://jitpack.io") }
google()
}
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))
implementation("app.revanced:revanced-patcher:1.1.0")
implementation("info.picocli:picocli:4.6.3")
implementation("com.android.tools.build:apksig:7.2.1")
implementation("com.github.revanced:jadb:master-SNAPSHOT") // updated fork
implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
}
java {
withSourcesJar()
withJavadocJar()
}
tasks {
@@ -51,21 +50,3 @@ tasks {
}
}
}
publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/revanced/revanced-cli")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}
publications {
register<MavenPublication>("gpr") {
from(components["java"])
}
}
}

View File

@@ -54,6 +54,8 @@ internal object Constants {
base_path="$PATH_REVANCED_APP"
stock_path=${'$'}( pm path $PLACEHOLDER | grep base | sed 's/package://g' )
chcon u:object_r:apk_data_file:s0 ${'$'}base_path
mount -o bind ${'$'}base_path ${'$'}stock_path
""".trimIndent()
}

View File

@@ -36,14 +36,14 @@ fun Patcher.addPatchesFiltered(
}
if (compatiblePackages == null) println("$prefix: Missing compatibility annotation. Continuing.")
else compatiblePackages.forEach { compatiblePackage ->
if (compatiblePackage.name != packageName) {
println("$prefix: Package name not matching ${compatiblePackage.name}.")
else {
if (!compatiblePackages.any { it.name == packageName }) {
println("$prefix: Incompatible package.")
return@patch
}
if (!(debugging || compatiblePackage.versions.any { it == packageVersion })) {
println("$prefix: Unsupported version.")
if (!(debugging || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion }})) {
println("$prefix: The package version is $packageVersion and is incompatible.")
return@patch
}
}