fix(kotlin): Separate library for Kotlin Android (#341)

* test

* test

* test

* test

* test

* disable lint

* test

* fix java version

* fix paths

* jna aar

Author: MathieuMorrissette

.github/workflows/kotlin/kotlin-linux/action.yml

@@ -7,6 +7,12 @@ runs:
       with:
         name: config.txt
 
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
     - name: Read Version and Set Gradle Property
       shell: bash
       id: setup
@@ -25,7 +31,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install nuget gcc-multilib software-properties-common
+        sudo apt-get install unzip openjdk-17-jdk-headless make gcc-multilib software-properties-common
         sudo apt-get install -y gcc-aarch64-linux-gnu
 
     - name: Install rust
@@ -58,7 +64,7 @@ runs:
         ANDROID_ROOT="/usr/local/lib/android"
         ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk"
         SDKMANAGER="${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager"
-        echo "y" | $SDKMANAGER "ndk;27.2.12479018"
+        echo "y" | sudo $SDKMANAGER "ndk;27.2.12479018" "build-tools;35.0.0" "platforms;android-34" "platform-tools"
 
         export ANDROID_NDK=$ANDROID_SDK_ROOT/ndk-bundle
 
@@ -76,9 +82,20 @@ runs:
         ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
         linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang\"" >> ./.cargo/config.toml
 
-    - name: Build
+    - name: Build Linux
       shell: bash
       working-directory: ./wrappers/kotlin
+      run: |
+        make linux
+
+        chmod +x gradlew
+        ./gradlew test
+        ./gradlew build
+        ./gradlew generatePomFileForMavenPublication
+
+    - name: Build Android
+      shell: bash
+      working-directory: ./wrappers/kotlin-android
       run: |
         export ANDROID_ROOT="/usr/local/lib/android"
         export ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk"
@@ -96,21 +113,29 @@ runs:
         export AR_x86_64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
 
         make android
-        make linux
 
         chmod +x gradlew
         ./gradlew test
         ./gradlew build
         ./gradlew generatePomFileForMavenPublication
 
     - name: Set version in pom file
-      run: sed -i '0,/<version>.*<\/version>/ s//<version>'"${{ steps.setup.outputs.version }}"'<\/version>/' 'lib/build/publications/maven/pom-default.xml'
       shell: bash
-      working-directory: ./wrappers/kotlin
+      working-directory: ./wrappers/
+      run: |
+        sed -i '0,/<version>.*<\/version>/ s//<version>'"${{ steps.setup.outputs.version }}"'<\/version>/' 'kotlin/lib/build/publications/maven/pom-default.xml'
+        sed -i '0,/<version>.*<\/version>/ s//<version>'"${{ steps.setup.outputs.version }}"'<\/version>/' 'kotlin-android/lib/build/publications/mavenAndroid/pom-default.xml'
 
-    - name: Upload Kotlin package
+
+    - name: Upload Kotlin JVM package
       uses: actions/[email protected]
       with:
-        name: kotlin
+        name: kotlin-jvm
         path: ./wrappers/kotlin/lib/build
 
+    - name: Upload Kotlin Android package
+      uses: actions/[email protected]
+      with:
+        name: kotlin-android
+        path: ./wrappers/kotlin-android/lib/build
+

.github/workflows/release-others.yml

@@ -76,7 +76,8 @@ jobs:
         7z x python-wheels-windows.zip -o./devolutions-crypto-wheels
 
         7z x wasm.zip -o./devolutions-crypto-npm
-        7z x kotlin.zip -o./devolutions-crypto-maven
+        7z x kotlin-jvm.zip -o./devolutions-crypto-maven-jvm
+        7z x kotlin-android.zip -o./devolutions-crypto-maven-android
         7z x swift.zip -o./devolutions-crypto-swift
         7z x config.txt.zip
 
@@ -142,8 +143,11 @@ jobs:
       run: |
         pip install --upgrade cloudsmith-cli
 
-        cloudsmith push maven devolutions/maven-public devolutions-crypto-maven/libs/lib.jar \
+        cloudsmith push maven devolutions/maven-public devolutions-crypto-maven-jvm/libs/lib.jar \
           --pom-file=devolutions-crypto-maven/publications/maven/pom-default.xml \
+
+        cloudsmith push maven devolutions/maven-public devolutions-crypto-maven-android/outputs/aar/lib-release.aar \
+        --pom-file=devolutions-crypto-maven-android/publications/mavenAndroid/pom-default.xml \
       env:
         CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
 

wrappers/kotlin-android/.gitattributes

@@ -0,0 +1,12 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
+# Binary files should be left untouched
+*.jar           binary
+

wrappers/kotlin-android/.gitignore

@@ -0,0 +1,9 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
+
+lib/src/main/resources/*
+extracted_aar
+jna.aar

wrappers/kotlin-android/Makefile

@@ -0,0 +1,39 @@
+# Default target
+.PHONY: all
+all: help
+
+# Platform-specific build targets
+.PHONY: android
+
+android:
+	cargo build --release --target aarch64-linux-android -p devolutions-crypto-uniffi
+	cargo build --release --target armv7-linux-androideabi -p devolutions-crypto-uniffi
+	cargo build --release --target i686-linux-android -p devolutions-crypto-uniffi
+	cargo build --release --target x86_64-linux-android -p devolutions-crypto-uniffi
+
+	cargo build --release -p uniffi-bindgen
+	cargo run --release -p uniffi-bindgen -- generate --library ../../target/aarch64-linux-android/release/libdevolutions_crypto_uniffi.so --language kotlin -o ./lib/src/main/kotlin/
+
+	mkdir -p ./lib/src/main/jniLibs/arm64-v8a/
+	mkdir -p ./lib/src/main/jniLibs/armeabi-v7a/
+	mkdir -p ./lib/src/main/jniLibs/x86/
+	mkdir -p ./lib/src/main/jniLibs/x86_64/
+
+	cp ../../target/aarch64-linux-android/release/libdevolutions_crypto_uniffi.so ./lib/src/main/jniLibs/arm64-v8a/libdevolutions_crypto_uniffi.so 
+	cp ../../target/armv7-linux-androideabi/release/libdevolutions_crypto_uniffi.so ./lib/src/main/jniLibs/armeabi-v7a/libdevolutions_crypto_uniffi.so 
+	cp ../../target/i686-linux-android/release/libdevolutions_crypto_uniffi.so ./lib/src/main/jniLibs/x86/libdevolutions_crypto_uniffi.so 
+	cp ../../target/x86_64-linux-android/release/libdevolutions_crypto_uniffi.so ./lib/src/main/jniLibs/x86_64/libdevolutions_crypto_uniffi.so 
+
+
+# Clean targets for each platform
+.PHONY: clean
+
+clean:
+	rm -rf ./lib/src/main/jniLibs/
+
+# Help target
+.PHONY: help
+help:
+	@echo "Makefile Usage:"
+	@echo "  make android     - Build for Android"
+	@echo "  make clean       - Clean all builds"

wrappers/kotlin-android/build-test.sh

@@ -0,0 +1,3 @@
+chmod +x gradlew
+./gradlew build
+./gradlew generatePomFileForMavenPublication

wrappers/kotlin-android/gradle/libs.versions.toml

@@ -0,0 +1,17 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
+
+[versions]
+commons-math3 = "3.6.1"
+guava = "33.2.1-jre"
+junit-jupiter-engine = "5.10.3"
+jna = "5.12.0"
+
+[libraries]
+commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter-engine" }
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.0.0" }

wrappers/kotlin-android/gradle/wrapper/gradle-wrapper.jar

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