feat: adds lazysodium-java (fork) as submodule (algorandfoundation#6)

* fix: make sure to include the gradle-wrapper jar

* try adding gradle build step

* fix invalid gradle name

* fix: aciton name

* test gradle wrapper

* feat: generate .jar files adhoc

.github/workflows/gradlew-test.yaml

@@ -5,7 +5,7 @@ on:
     branches: [main]
 
 jobs:
-  test:
+  test-and-build:
     runs-on: ubuntu-latest
 
     steps:
@@ -17,9 +17,15 @@ jobs:
           java-version: "11"
           distribution: "adopt"
 
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      - name: Run gradle wrapper
+        run: gradle wrapper
+
       - name: Run tests
         run: ./gradlew test
 

.gitignore

@@ -29,5 +29,5 @@ replay_pid*
 # Ignore Gradle build output directory
 build
 
-# Include the .jar files that we import
-!lib/libs/*.jar
+# But include the gradle-wrapper .jar file
+!gradle/wrapper/gradle-wrapper.jar

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lazysodium-java"]
+	path = lazysodium-java
+	url = https://github.com/algorandfoundation/lazysodium-java

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "java.configuration.updateBuildConfiguration": "automatic"
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "java.compile.nullAnalysis.mode": "automatic"
 }

buildJars.sh

@@ -0,0 +1,5 @@
+cd lazysodium-java
+./gradlew build
+cd ..
+mv lazysodium-java/build/libs/* lib/libs/
+./gradlew test

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

lib/src/main/kotlin/bip32ed25519/Bip32Ed25519.kt

@@ -17,8 +17,6 @@
 
 package bip32ed25519
 
-// import kotlinx.serialization.cbor.Cbor
-
 import com.goterl.lazysodium.LazySodiumJava
 import com.goterl.lazysodium.SodiumJava
 import com.goterl.lazysodium.utils.LibraryLoader