Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions brut.apktool/apktool-cli/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
val gitRevision: String by rootProject.extra
val apktoolVersion: String by rootProject.extra
val r8: Configuration by configurations.creating
val gitRevision = rootProject.extra["gitRevision"] as String
val apktoolVersion = rootProject.extra["apktoolVersion"] as String
val r8: Configuration = configurations.create("r8")

plugins {
application
Expand Down
22 changes: 15 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ val version = "3.1.0"
val suffix = "SNAPSHOT"

// Strings embedded into the build.
var gitRevision by extra("")
var apktoolVersion by extra("")
var gitRevision = ""
var apktoolVersion = ""

defaultTasks("build", "shadowJar", "proguard")

Expand Down Expand Up @@ -54,6 +54,9 @@ if ("release" !in gradle.startParameter.taskNames) {
project.logger.lifecycle("Building RELEASE ($gitBranch): $apktoolVersion")
}

extra.set("gitRevision", gitRevision)
extra.set("apktoolVersion", apktoolVersion)

plugins {
`java-library`
alias(libs.plugins.vanniktech.maven.publish) apply false
Expand Down Expand Up @@ -91,22 +94,27 @@ subprojects {
}

tasks.withType<Test>().configureEach {
val projectName = project.name;

testLogging {
events("failed", "skipped")
}
afterSuite(KotlinClosure2<TestDescriptor, TestResult, Unit>({ descriptor, result ->
// Only print the summary for the top-level suite (the task itself, not individual classes).
if (descriptor.parent == null) {
addTestListener(object : TestListener {
override fun afterSuite(suite: TestDescriptor, result: TestResult) {
if (suite.parent != null) {
return;
}

logger.lifecycle(
"[{}] Tests: {} passed, {} failed, {} skipped (total: {})",
project.name,
projectName,
result.successfulTestCount,
result.failedTestCount,
result.skippedTestCount,
result.testCount
)
}
}))
})
}

// CI passes -PtestJdkVersion to run the test suite on an older JVM (8/11)
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
networkTimeout=10000
retries=2
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 9 additions & 10 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 15 additions & 25 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading