diff --git a/api/revanced-patcher.api b/api/revanced-patcher.api new file mode 100644 index 0000000..e69de29 diff --git a/build.gradle.kts b/build.gradle.kts index 491907e..49603fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,46 @@ +import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension + plugins { - kotlin("jvm") version "1.9.0" apply false + kotlin("jvm") version "1.9.0" alias(libs.plugins.binary.compatibility.validator) + `maven-publish` + signing + java } -allprojects { +val publicationVersion = project.version.toString() + +subprojects { apply(plugin = "maven-publish") + apply(plugin = "signing") + apply(plugin = "java") + apply(plugin ="kotlin") group = "app.revanced" -} \ No newline at end of file + version = publicationVersion + + repositories { + mavenCentral() + mavenLocal() + maven { url = uri("https://jitpack.io") } + google() + } + + java { + withJavadocJar() + withSourcesJar() + } + + configure { + kotlin { jvmToolchain(11) } + } + + tasks { + test { + useJUnitPlatform() + testLogging { + events("PASSED", "SKIPPED", "FAILED") + } + } + } +} diff --git a/gradle.properties b/gradle.properties index 5a78296..7b06f5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 16.0.2 +version = 16.0.2 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 512c296..f10c02f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] android = "4.1.1.4" kotlin-reflect = "1.9.0" -apktool-lib = "2.8.2-6" +apktool-lib = "2.9.1" kotlin-test = "1.8.20-RC" -kotlinx-coroutines-core = "1.7.1" -multidexlib2 = "3.0.3.r2" +kotlinx-coroutines-core = "1.7.3" +multidexlib2 = "3.0.3.r3" smali = "3.0.3" -symbol-processing-api = "1.9.0-1.0.11" +symbol-processing-api = "1.9.10-1.0.13" xpp3 = "1.1.4c" binary-compatibility-validator = "0.13.2" kotlin-compile-testing-ksp = "1.5.0" @@ -16,7 +16,7 @@ ksp = "1.9.0-1.0.11" [libraries] android = { module = "com.google.android:android", version.ref = "android" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" } -apktool-lib = { module = "app.revanced:apktool-lib", version.ref = "apktool-lib" } +apktool-lib = { module = "app.revanced:apktool", version.ref = "apktool-lib" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" } multidexlib2 = { module = "app.revanced:multidexlib2", version.ref = "multidexlib2" } diff --git a/revanced-patch-annotation-processor/build.gradle.kts b/revanced-patch-annotation-processor/build.gradle.kts index 2c2f860..5dafe1d 100644 --- a/revanced-patch-annotation-processor/build.gradle.kts +++ b/revanced-patch-annotation-processor/build.gradle.kts @@ -1,5 +1,4 @@ plugins { - kotlin("jvm") version "1.9.0" alias(libs.plugins.ksp) } @@ -12,39 +11,11 @@ dependencies { testImplementation(libs.kotlin.compile.testing) } -tasks { - test { - useJUnitPlatform() - testLogging { - events("PASSED", "SKIPPED", "FAILED") - } - } -} - -kotlin { jvmToolchain(11) } - -java { - withSourcesJar() -} - publishing { - repositories { - mavenLocal() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } publications { - create("gpr") { + create("revanced-patch-annotation-processor-publication") { from(components["java"]) - version = project.version.toString() - pom { name = "ReVanced patch annotation processor" description = "Annotation processor for patches." diff --git a/revanced-patcher/build.gradle.kts b/revanced-patcher/build.gradle.kts index 1a0713f..ff913b9 100644 --- a/revanced-patcher/build.gradle.kts +++ b/revanced-patcher/build.gradle.kts @@ -1,7 +1,3 @@ -plugins { - kotlin("jvm") version "1.9.0" -} - dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.xpp3) @@ -17,42 +13,16 @@ dependencies { } tasks { - test { - useJUnitPlatform() - testLogging { - events("PASSED", "SKIPPED", "FAILED") - } - } - processResources { expand("projectVersion" to project.version) } } -kotlin { jvmToolchain(11) } - -java { - withSourcesJar() -} - publishing { - repositories { - mavenLocal() - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } publications { - create("gpr") { + create("revanced-patcher-publication") { from(components["java"]) - version = project.version.toString() - pom { name = "ReVanced Patcher" description = "Patcher used by ReVanced." diff --git a/settings.gradle.kts b/settings.gradle.kts index 3761ccf..23a5a77 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,22 +1 @@ -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() - google() - mavenLocal() - listOf("multidexlib2", "apktool").forEach { repo -> - maven { - url = uri("https://maven.pkg.github.com/revanced/$repo") - credentials { - username = githubUsername - password = githubPassword - } - } - } - } -} - include("revanced-patch-annotation-processor", "revanced-patcher") \ No newline at end of file