From 33f48f1f3f02aba2b07403b55be95cc9002d3225 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 9 Oct 2023 18:42:16 +0200 Subject: [PATCH 1/4] build(Needs bump): Publish artifacts on Jitpack --- build.gradle.kts | 11 ----------- gradle/libs.versions.toml | 8 ++++---- settings.gradle.kts | 15 +-------------- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 88e49cf..08fdcc9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,17 +34,6 @@ java { } publishing { - repositories { - mavenLocal() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/revanced/revanced-library") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } publications { create("gpr") { from(components["java"]) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1eca03e..bb47355 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] -apksig = "8.1.1" +apksig = "8.1.2" bcpkix-jdk18on = "1.76" jackson-module-kotlin = "2.14.3" -jadb = "2531a28109" +jadb = "1.2.1" kotlin-reflect = "1.9.0" kotlin-test = "1.8.20-RC" -revanced-patcher = "16.0.1" +revanced-patcher = "17.0.0" binary-compatibility-validator = "0.13.2" [libraries] apksig = { module = "com.android.tools.build:apksig", version.ref = "apksig" } bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkix-jdk18on" } jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson-module-kotlin" } -jadb = { module = "com.github.revanced:jadb", version.ref = "jadb" } +jadb = { module = "app.revanced:jadb", version.ref = "jadb" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" } revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" } diff --git a/settings.gradle.kts b/settings.gradle.kts index acb3340..0a621b2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,22 +1,9 @@ -val githubUsername: String = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR") -val githubPassword: String = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN") - dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenCentral() mavenLocal() - google() maven { url = uri("https://jitpack.io") } - listOf("revanced-patcher", "jadb").forEach { repo -> - maven { - url = uri("https://maven.pkg.github.com/revanced/$repo") - credentials { - username = githubUsername - password = githubPassword - } - } - } + google() } } From dc0c9f6cc9a434b87c87fb59e863933692422712 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 9 Oct 2023 16:44:17 +0000 Subject: [PATCH 2/4] chore(release): 1.1.3-dev.1 [skip ci] ## [1.1.3-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.2...v1.1.3-dev.1) (2023-10-09) --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb65703..d7a2adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.1.3-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.2...v1.1.3-dev.1) (2023-10-09) + ## [1.1.2](https://github.com/ReVanced/revanced-library/compare/v1.1.1...v1.1.2) (2023-10-05) ## [1.1.2-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.1...v1.1.2-dev.1) (2023-10-05) diff --git a/gradle.properties b/gradle.properties index 83931ee..e3af2cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 1.1.2 +version = 1.1.3-dev.1 From 0dc83c3e0aa8a089add8645c56e20ebffa171ce5 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 9 Oct 2023 18:51:10 +0200 Subject: [PATCH 3/4] build(Needs bump): Use correct dependency --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb47355..c15bcbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module- jadb = { module = "app.revanced:jadb", version.ref = "jadb" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" } -revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" } +revanced-patcher = { module = "app.revanced.revanced-patcher:revanced-patcher", version.ref = "revanced-patcher" } [plugins] binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" } From 6019320d9e85eb75905a8d50ce4827b320e00d25 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 9 Oct 2023 16:53:41 +0000 Subject: [PATCH 4/4] chore(release): 1.1.3-dev.2 [skip ci] ## [1.1.3-dev.2](https://github.com/ReVanced/revanced-library/compare/v1.1.3-dev.1...v1.1.3-dev.2) (2023-10-09) --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7a2adf..6b86442 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.1.3-dev.2](https://github.com/ReVanced/revanced-library/compare/v1.1.3-dev.1...v1.1.3-dev.2) (2023-10-09) + ## [1.1.3-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.2...v1.1.3-dev.1) (2023-10-09) ## [1.1.2](https://github.com/ReVanced/revanced-library/compare/v1.1.1...v1.1.2) (2023-10-05) diff --git a/gradle.properties b/gradle.properties index e3af2cf..23f3711 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 1.1.3-dev.1 +version = 1.1.3-dev.2