build adjustments

.github/workflows/jni_artifacts.yml

@@ -42,6 +42,12 @@ jobs:
     - run: rustup target add ${{ matrix.additional-rust-target }}
       if: ${{ matrix.additional-rust-target != '' }}
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+      with:
+        version: '3.x'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
     # install nasm compiler for boring
     - name: Install nasm
       if: startsWith(matrix.os, 'windows')
@@ -52,12 +58,6 @@ jobs:
       run: java/build_jni.sh desktop
       shell: bash
 
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        version: '3.x'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Build for alternate target (arm64)
       run: java/build_jni.sh desktop
       if: matrix.os == 'macos-latest'
@@ -107,6 +107,12 @@ jobs:
     - name: Copy libraries
       run: mv ${{ steps.download.outputs.download-path }}/*/* java/shared/resources && find java/shared/resources
 
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+      with:
+        version: '3.x'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
     - run: make
       if: ${{ inputs.dry_run }}
       working-directory: java

java/Makefile

@@ -19,7 +19,7 @@ java_build: DOCKER_EXTRA=$(shell [ -L build ] && P=$$(readlink build) && echo -v
 java_build: docker_image
 	$(DOCKER) run $(DOCKER_TTY_FLAG) --init --rm --user $$(id -u):$$(id -g) \
 	  -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \
-		sh -c "cd src/java; ./gradlew build"
+		sh -c "cd src/java; ./gradlew build -PskipAndroid"
 
 java_test: java_build
 	$(DOCKER) run $(DOCKER_TTY_FLAG) --init --rm --user $$(id -u):$$(id -g) \
@@ -36,7 +36,7 @@ publish_java: docker_image
 		-e ORG_GRADLE_PROJECT_signingPassword \
 		-e ORG_GRADLE_PROJECT_signingKey \
 		$(DOCKER_IMAGE) \
-		sh -c "cd src/java; ./gradlew publish closeSonatypeStagingRepository"
+		sh -c "cd src/java; ./gradlew publish -PskipSigning closeSonatypeStagingRepository"
 
 # We could run these through Docker, but they would have the same result anyway.
 

java/build.gradle

@@ -83,7 +83,8 @@ ext.setUpSigningKey = { signingExt ->
 
 nexusPublishing {
     repositories {
-        sonatype {
+        gluonNexus {
+            nexusUrl = uri(project.findProperty('sonatypeRepo') ?: "https://oss.sonatype.org/service/local/staging/deploy/maven2/")
             username = project.findProperty('sonatypeUsername') ?: ""
             password = project.findProperty('sonatypePassword') ?: ""
         }