Skip to content

Commit

Permalink
Fix issue with publishing preinstrumented jars
Browse files Browse the repository at this point in the history
In preinstrumented/build.gradle, it should be 'artifact
<artifact_path>', not 'artifact = <artifact_path>'.

Add this task to the gradle_tasks_validation GitHub Action, and increase
parallelization of some gradle commands in gradle_tasks_validation.

Fixes #8950
  • Loading branch information
hoisie committed Mar 29, 2024
1 parent 758a3d4 commit a888911
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/gradle_tasks_validation.yml
Expand Up @@ -34,7 +34,7 @@ jobs:
- uses: gradle/actions/setup-gradle@v3

- name: Run aggregateDocs
run: ./gradlew clean aggregateDocs
run: ./gradlew clean aggregateDocs --parallel

run_javadocJar:
runs-on: ubuntu-22.04
Expand All @@ -51,7 +51,8 @@ jobs:
- uses: gradle/actions/setup-gradle@v3

- name: Run javadocJar
run: ./gradlew clean javadocJar
run: ./gradlew clean javadocJar --parallel


run_instrumentAll:
runs-on: ubuntu-22.04
Expand All @@ -73,6 +74,9 @@ jobs:
- name: Run :preinstrumented:instrumentAll with SDK 33
run: PREINSTRUMENTED_SDK_VERSIONS=33 ./gradlew :preinstrumented:instrumentAll

- name: Run :preinstrumented:publishToMavenLocal with SDK 33
run: PREINSTRUMENTED_SDK_VERSIONS=33 PUBLISH_PREINSTRUMENTED_JARS=true ./gradlew :preinstrumented:publishToMavenLocal

run_publishToMavenLocal:
runs-on: ubuntu-22.04

Expand Down
4 changes: 3 additions & 1 deletion preinstrumented/build.gradle
Expand Up @@ -66,7 +66,7 @@ if (System.getenv('PUBLISH_PREINSTRUMENTED_JARS') == "true") {
publications {
sdksToInstrument().each { androidSdk ->
"sdk${androidSdk.apiLevel}"(MavenPublication) {
artifact = layout.buildDirectory.file(androidSdk.preinstrumentedJarFileName).get().asFile.path
artifact layout.buildDirectory.file(androidSdk.preinstrumentedJarFileName).get().asFile.path
artifactId 'android-all-instrumented'
artifact emptySourcesJar
artifact emptyJavadocJar
Expand Down Expand Up @@ -114,6 +114,8 @@ if (System.getenv('PUBLISH_PREINSTRUMENTED_JARS') == "true") {
}

signing {
// Skip signing if a signing key is not configured.
required { project.hasProperty("signing.keyId") }
sdksToInstrument().each { androidSdk ->
sign publishing.publications."sdk${androidSdk.apiLevel}"
}
Expand Down

0 comments on commit a888911

Please sign in to comment.