From 0fd4443db71a7815cec02ef091ad47e8f11af9b0 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 14 Feb 2024 00:08:20 +0100 Subject: [PATCH] build: Revert publishing on Jitpack --- .jitpack.yml | 5 +++++ brut.apktool/apktool-lib/build.gradle.kts | 16 +++++++++++++++- build.gradle.kts | 20 +++++++++++++++++--- gradle/libs.versions.toml | 2 -- 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 .jitpack.yml diff --git a/.jitpack.yml b/.jitpack.yml new file mode 100644 index 00000000..d8aea5ab --- /dev/null +++ b/.jitpack.yml @@ -0,0 +1,5 @@ +jdk: + - openjdk9 +install: + - echo "This is not supported. See iBotPeaches/Apktool#2102" + - ./gradlew invalid-command-to-crash-out diff --git a/brut.apktool/apktool-lib/build.gradle.kts b/brut.apktool/apktool-lib/build.gradle.kts index b2b4907e..ab393934 100644 --- a/brut.apktool/apktool-lib/build.gradle.kts +++ b/brut.apktool/apktool-lib/build.gradle.kts @@ -1,6 +1,20 @@ val gitRevision: String by rootProject.extra val apktoolVersion: String by rootProject.extra +// region Determine Android SDK location + +val sdkRoot: String? = System.getenv("ANDROID_SDK_ROOT") +val androidJarPath: String = if (sdkRoot == null) { + GradleException("Missing ANDROID_SDK_ROOT").printStackTrace() + + "com.google.android:android:4.1.1.4" +} else { + val androidVersion = 33 + File("$sdkRoot/platforms/android-$androidVersion/android.jar").path +} + +// endregion + tasks { processResources { from("src/main/resources/properties") { @@ -40,5 +54,5 @@ dependencies { testImplementation(libs.junit) testImplementation(libs.xmlunit) - compileOnly(libs.android) + compileOnly(files(androidJarPath)) } diff --git a/build.gradle.kts b/build.gradle.kts index 3e3e296f..268ff87c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import java.io.ByteArrayOutputStream val version = "2.9.1" -val suffix = "" +val suffix = "SNAPSHOT" // Strings embedded into the build. var gitRevision by extra("") @@ -36,7 +36,7 @@ val gitBranch: String? by lazy { } } -if ("publishToMavenLocal" !in gradle.startParameter.taskNames) { +if ("release" !in gradle.startParameter.taskNames) { val hash = this.gitDescribe if (hash == null) { @@ -84,7 +84,7 @@ subprojects { targetCompatibility = JavaVersion.VERSION_1_8 } - val mavenProjects = arrayOf("apktool-lib", "brut.j.common", "brut.j.util", "brut.j.dir") + val mavenProjects = arrayOf("apktool-lib", "apktool-cli", "brut.j.common", "brut.j.util", "brut.j.dir") if (project.name in mavenProjects) { apply(plugin = "maven-publish") @@ -96,6 +96,15 @@ subprojects { } publishing { + repositories { + maven { + url = uri("https://maven.pkg.github.com/revanced/Apktool") + credentials { + username = System.getenv("GITHUB_ACTOR") ?: project.findProperty("gpr.user").toString() + password = System.getenv("GITHUB_TOKEN") ?: project.findProperty("gpr.key").toString() + } + } + } publications { register("mavenJava", MavenPublication::class) { from(components["java"]) @@ -139,6 +148,11 @@ subprojects { tasks.withType() { (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") } + + signing { + useGpgCmd() + sign(publishing.publications["mavenJava"]) + } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 43cfa0d9..e50d79d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,6 @@ shadow = "8.1.1" smali = "3.0.3" xmlpull = "1.1.4c" xmlunit = "2.9.1" -android = "4.1.1.4" [libraries] baksmali = { module = "com.android.tools.smali:smali-baksmali", version.ref = "baksmali" } @@ -25,7 +24,6 @@ proguard = { module = "com.guardsquare:proguard-gradle", version.ref = "proguard smali = { module = "com.android.tools.smali:smali", version.ref = "smali" } xmlpull = { module = "xpp3:xpp3", version.ref = "xmlpull" } xmlunit = { module = "org.xmlunit:xmlunit-legacy", version.ref = "xmlunit" } -android = { module = "com.google.android:android", version.ref = "android" } [plugins] shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }