From 2979f9446254f923fa58c78eaa71381122c941b1 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@isaacbrodsky.com>
Date: Fri, 10 Oct 2025 11:11:43 -0700
Subject: [PATCH 1/2] attempt to fix h3-java publishing for jar

---
 build.gradle | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4322b34..3eea12d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,6 +73,7 @@ compileJava {
 // Task to build H3 native code
 task buildH3(type: Exec) {
     workingDir "${projectDir}"
+    dependsOn compileJava
     if (System.getProperty('os.name').toLowerCase().contains('windows')) {
         commandLine 'powershell', '-ExecutionPolicy', 'Bypass', '-File',
                 './src/main/c/h3-java/build-h3-windows.ps1', h3GitRemote, h3GitReference
@@ -81,21 +82,22 @@ task buildH3(type: Exec) {
                 h3SystemPrune, h3DockcrossTag, h3DockcrossOnly,
                 h3GithubArtifactsUse, h3GithubArtifactsByRun
     }
-    dependsOn compileJava
     outputs.dir("${projectDir}/src/main/resources")
 }
 
 // Task to build H3 native code for Android only
 task buildH3Android(type: Exec) {
+    mustRunAfter buildH3
+    dependsOn compileJava
     workingDir "${projectDir}"
     commandLine './src/main/c/h3-java/build-h3.sh', h3GitRemote, h3GitReference, 'true',
             h3SystemPrune, h3DockcrossTag, 'android-arm android-arm64',
             h3GithubArtifactsUse, h3GithubArtifactsByRun
-    dependsOn compileJava
     outputs.dir("${projectDir}/src/main/resources")
 }
 
 processResources {
+    mustRunAfter buildH3Android
     dependsOn buildH3
 }
 
@@ -143,7 +145,7 @@ task compileAndroidJava(type: JavaCompile) {
 
 // Android JAR task - creates JAR with only Android native libraries
 task androidJar(type: Jar) {
-    dependsOn compileAndroidJava
+    dependsOn compileAndroidJava, buildH3Android
     archiveBaseName = 'h3-android'
     archiveVersion = project.version
     
@@ -259,6 +261,8 @@ sourcesJar {
 
 // Android sources JAR
 task androidSourcesJar(type: Jar) {
+    dependsOn buildH3Android
+
     archiveBaseName = 'h3-android'
     archiveVersion = project.version
     archiveClassifier = 'sources'

From 5a8e7820ccf52aa520ba6b4c0fb2c68456b3d5b7 Mon Sep 17 00:00:00 2001
From: Isaac Brodsky <isaac@isaacbrodsky.com>
Date: Fri, 10 Oct 2025 12:04:17 -0700
Subject: [PATCH 2/2] fix android and java build at same time

---
 build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle b/build.gradle
index 3eea12d..e7e6c5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -125,6 +125,7 @@ jacocoTestReport {
 
 jar {
     dependsOn buildH3
+    mustRunAfter buildH3Android
     from sourceSets.main.resources
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
@@ -255,6 +256,7 @@ mavenPublishing {
 
 sourcesJar {
     dependsOn buildH3
+    mustRunAfter buildH3Android
 }