diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1cb69f97..729aa449 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,8 +11,8 @@ accompanist = "0.30.1" serialization = "1.6.0" collection = "0.3.5" room-version = "2.5.2" -revanced-patcher = "16.0.1" -revanced-library = "1.1.1" +revanced-patcher = "17.0.0" +revanced-library = "1.1.4" koin-version = "3.4.3" koin-version-compose = "3.4.6" reimagined-navigation = "1.5.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index fbde0be1..c4887269 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,59 +1,19 @@ pluginManagement { repositories { - // TODO: remove this once https://github.com/gradle/gradle/issues/23572 is fixed - val (gprUser, gprKey) = if (File(".gradle/gradle.properties").exists()) { - File(".gradle/gradle.properties").inputStream().use { - java.util.Properties().apply { load(it) }.let { - it.getProperty("gpr.user") to it.getProperty("gpr.key") - } - } - } else { - null to null - } - - fun RepositoryHandler.githubPackages(name: String) = maven { - url = uri(name) - credentials { - username = gprUser ?: providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR") - password = gprKey ?: providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN") - } - } - gradlePluginPortal() google() mavenCentral() maven("https://jitpack.io") - githubPackages("https://maven.pkg.github.com/revanced/revanced-patcher") - githubPackages("https://maven.pkg.github.com/revanced/revanced-library") + mavenLocal() } } dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - // TODO: remove this once https://github.com/gradle/gradle/issues/23572 is fixed - val (gprUser, gprKey) = if (File(".gradle/gradle.properties").exists()) { - File(".gradle/gradle.properties").inputStream().use { - java.util.Properties().apply { load(it) }.let { - it.getProperty("gpr.user") to it.getProperty("gpr.key") - } - } - } else { - null to null - } - - fun RepositoryHandler.githubPackages(name: String) = maven { - url = uri(name) - credentials { - username = gprUser ?: providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR") - password = gprKey ?: providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN") - } - } - google() mavenCentral() maven("https://jitpack.io") - githubPackages("https://maven.pkg.github.com/revanced/revanced-patcher") - githubPackages("https://maven.pkg.github.com/revanced/revanced-library") + mavenLocal() } } rootProject.name = "ReVanced Manager"