From b892729332987e7590b88cf56d9c50a8ef83a771 Mon Sep 17 00:00:00 2001 From: Lucaskyy Date: Sun, 10 Apr 2022 00:52:32 +0200 Subject: [PATCH] chore: update kotlin, don't shade deps, publish to maven local, make deps api instead of implementation --- build.gradle.kts | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 65c65d6..4d8823f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,7 @@ plugins { - kotlin("jvm") version "1.6.10" + kotlin("jvm") version "1.6.20" java `maven-publish` - id("com.github.johnrengelman.shadow") version "7.1.2" } group = "app.revanced" @@ -25,23 +24,19 @@ repositories { dependencies { implementation(kotlin("stdlib")) - implementation("app.revanced:multidexlib2:2.5.2.r2") + api("app.revanced:multidexlib2:2.5.2.r2") @Suppress("GradlePackageUpdate") - implementation("org.smali:smali:2.5.2") + api("org.smali:smali:2.5.2") testImplementation(kotlin("test")) } -tasks.test { - useJUnitPlatform() - testLogging { - events("PASSED", "SKIPPED", "FAILED") - } -} - tasks { - build { - dependsOn(shadowJar) + test { + useJUnitPlatform() + testLogging { + events("PASSED", "SKIPPED", "FAILED") + } } } @@ -50,25 +45,26 @@ java { withJavadocJar() } +val isGitHubCI = System.getenv("GITHUB_ACTOR") != null + publishing { repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/ReVancedTeam/revanced-patcher") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") + if (isGitHubCI) { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/ReVancedTeam/revanced-patcher") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } } + } else { + mavenLocal() } } publications { register("gpr") { from(components["java"]) } - register("shadow") { - project.extensions.configure { - component(this@register) - } - } } }