Skip to content

Commit c2cacdf

Browse files
authored
attempt to fix h3-java publishing for jar (#189)
* attempt to fix h3-java publishing for jar * fix android and java build at same time
1 parent b2ff9d3 commit c2cacdf

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ compileJava {
7373
// Task to build H3 native code
7474
task buildH3(type: Exec) {
7575
workingDir "${projectDir}"
76+
dependsOn compileJava
7677
if (System.getProperty('os.name').toLowerCase().contains('windows')) {
7778
commandLine 'powershell', '-ExecutionPolicy', 'Bypass', '-File',
7879
'./src/main/c/h3-java/build-h3-windows.ps1', h3GitRemote, h3GitReference
@@ -81,21 +82,22 @@ task buildH3(type: Exec) {
8182
h3SystemPrune, h3DockcrossTag, h3DockcrossOnly,
8283
h3GithubArtifactsUse, h3GithubArtifactsByRun
8384
}
84-
dependsOn compileJava
8585
outputs.dir("${projectDir}/src/main/resources")
8686
}
8787

8888
// Task to build H3 native code for Android only
8989
task buildH3Android(type: Exec) {
90+
mustRunAfter buildH3
91+
dependsOn compileJava
9092
workingDir "${projectDir}"
9193
commandLine './src/main/c/h3-java/build-h3.sh', h3GitRemote, h3GitReference, 'true',
9294
h3SystemPrune, h3DockcrossTag, 'android-arm android-arm64',
9395
h3GithubArtifactsUse, h3GithubArtifactsByRun
94-
dependsOn compileJava
9596
outputs.dir("${projectDir}/src/main/resources")
9697
}
9798

9899
processResources {
100+
mustRunAfter buildH3Android
99101
dependsOn buildH3
100102
}
101103

@@ -123,6 +125,7 @@ jacocoTestReport {
123125

124126
jar {
125127
dependsOn buildH3
128+
mustRunAfter buildH3Android
126129
from sourceSets.main.resources
127130
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
128131
}
@@ -143,7 +146,7 @@ task compileAndroidJava(type: JavaCompile) {
143146

144147
// Android JAR task - creates JAR with only Android native libraries
145148
task androidJar(type: Jar) {
146-
dependsOn compileAndroidJava
149+
dependsOn compileAndroidJava, buildH3Android
147150
archiveBaseName = 'h3-android'
148151
archiveVersion = project.version
149152

@@ -253,12 +256,15 @@ mavenPublishing {
253256

254257
sourcesJar {
255258
dependsOn buildH3
259+
mustRunAfter buildH3Android
256260
}
257261

258262

259263

260264
// Android sources JAR
261265
task androidSourcesJar(type: Jar) {
266+
dependsOn buildH3Android
267+
262268
archiveBaseName = 'h3-android'
263269
archiveVersion = project.version
264270
archiveClassifier = 'sources'

0 commit comments

Comments
 (0)