diff --git a/java/.gitignore b/java/.gitignore index 8f60484e5a..cedb8f35b3 100644 --- a/java/.gitignore +++ b/java/.gitignore @@ -1,8 +1,16 @@ # Ignore Gradle project-specific cache directory .gradle +# Ignore gradle wrapper files (they are managed by gradle) +gradlew +gradlew.bat +gradle + # Ignore Gradle build output directory build +# IDE files +.idea + # Ignore generated files (e.g. protobuf) generated diff --git a/java/build.gradle b/java/build.gradle index 390053f28d..5e612c0b51 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'application' id 'java-library' id 'io.freefair.lombok' version '6.4.0' id 'jacoco' @@ -98,4 +99,3 @@ spotless { } } // End of Spotless section - diff --git a/java/kotlin-sample/build.gradle b/java/kotlin-sample/build.gradle new file mode 100644 index 0000000000..7b75df24b4 --- /dev/null +++ b/java/kotlin-sample/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' + id 'application' +} + +dependencies { + // Required for interop + implementation "net.java.dev.jna:jna:5.8.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20" + + implementation files("../../kotlin/client/build/libs/kotlinbabushka-0.0.1.jar") +} + +application { + mainClass = 'babushka.javababushka' +} diff --git a/java/kotlin-sample/src/main/java/babushka/javababushka.java b/java/kotlin-sample/src/main/java/babushka/javababushka.java new file mode 100644 index 0000000000..89834f110b --- /dev/null +++ b/java/kotlin-sample/src/main/java/babushka/javababushka.java @@ -0,0 +1,20 @@ +package babushka; + +import static babushka.KotlibbabushkaKt.staticFunction; +import static babushka.KotlibbabushkaKt.staticFunctionWhichThrows; + +public class javababushka { + + public static void main(String[] args) { + var d = staticFunction(); + + try { + var c = staticFunctionWhichThrows(); + } catch (BabushkaException e) { + throw new RuntimeException(e); + } + + var b = new BabushkaClient().classFunction(); + var a = 42; + } +} diff --git a/java/settings.gradle b/java/settings.gradle index c392c65247..8cb000e63a 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -3,3 +3,4 @@ rootProject.name = 'javababushka' include 'client' include 'integTest' include 'benchmarks' +include 'kotlin-sample' diff --git a/kotlin/.gitignore b/kotlin/.gitignore new file mode 100644 index 0000000000..4353c2d811 --- /dev/null +++ b/kotlin/.gitignore @@ -0,0 +1,16 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore gradle wrapper files (they are managed by gradle) +gradlew +gradlew.bat +gradle + +# Ignore Gradle build output directory +build + +# IDE files +.idea + +# All client sources are autogenerated +client/src diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts new file mode 100644 index 0000000000..45055baab8 --- /dev/null +++ b/kotlin/build.gradle.kts @@ -0,0 +1,14 @@ +buildscript { + repositories { + mavenCentral() + } +} + +allprojects { + group = "babushka" + version = "0.0.1" + + repositories { + mavenCentral() + } +} diff --git a/kotlin/client/build.gradle.kts b/kotlin/client/build.gradle.kts new file mode 100644 index 0000000000..1b48689014 --- /dev/null +++ b/kotlin/client/build.gradle.kts @@ -0,0 +1,40 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.9.10" + `java-library` + + // Custom plugin to generate the native libs and bindings file + id("babushka.plugin.generate-jvm-bindings") +} + +// This task dependency ensures that we build the bindings +// binaries before running the tests +tasks.withType { + dependsOn("buildJvmLib") + + kotlinOptions { + jvmTarget = "11" + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + withSourcesJar() + withJavadocJar() +} + +dependencies { + implementation(platform("org.jetbrains.kotlin:kotlin-bom")) + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7") + implementation("net.java.dev.jna:jna:5.8.0") +} + +tasks.jar { + manifest { + attributes(mapOf("Implementation-Title" to "kotlinbabushka", + "Implementation-Version" to project.version)) + } + archiveBaseName.set("kotlinbabushka") +} diff --git a/kotlin/gradle.properties b/kotlin/gradle.properties new file mode 100644 index 0000000000..7fc6f1ff27 --- /dev/null +++ b/kotlin/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/kotlin/gradle/wrapper/gradle-wrapper.jar b/kotlin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..249e5832f0 Binary files /dev/null and b/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/kotlin/gradle/wrapper/gradle-wrapper.properties b/kotlin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..15de90249f --- /dev/null +++ b/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/kotlin/gradlew b/kotlin/gradlew new file mode 100755 index 0000000000..1b6c787337 --- /dev/null +++ b/kotlin/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/kotlin/gradlew.bat b/kotlin/gradlew.bat new file mode 100755 index 0000000000..107acd32c4 --- /dev/null +++ b/kotlin/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/kotlin/interop/.cargo/config.toml b/kotlin/interop/.cargo/config.toml new file mode 100644 index 0000000000..c8e15bc8bf --- /dev/null +++ b/kotlin/interop/.cargo/config.toml @@ -0,0 +1,3 @@ +[env] +BABUSHKA_NAME = { value = "BabushkaKo", force = true } +BABUSHKA_VERSION = "0.1.0" diff --git a/kotlin/interop/Cargo.toml b/kotlin/interop/Cargo.toml new file mode 100644 index 0000000000..d1c4755e09 --- /dev/null +++ b/kotlin/interop/Cargo.toml @@ -0,0 +1,45 @@ +[package] +name = "kotlinbabushka" +version = "0.1.0" +edition = "2021" +license = "BSD-3-Clause" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +name = "kotlinbabushka" +crate-type = ["lib", "staticlib", "cdylib"] + +[[bin]] +name = "uniffi-bindgen" +path = "uniffi-bindgen.rs" + +[features] +default = ["uniffi/cli"] + + +[dependencies] +# redis = { path = "../../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] } +# tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } +# logger_core = {path = "../../logger_core"} +tracing-subscriber = "0.3.16" +uniffi = "0.23.0" +thiserror = "1.0.49" + +[build-dependencies] +uniffi = { version = "0.23.0", features = ["build"] } + +[dev-dependencies] +uniffi = { version = "0.23.0", features = ["bindgen-tests"] } +assert_matches = "1.5.0" + +[profile.release] +lto = true +debug = true + +[profile.release-smaller] +inherits = "release" +opt-level = 'z' # Optimize for size. +lto = true # Enable Link Time Optimization +codegen-units = 1 # Reduce number of codegen units to increase optimizations. +panic = 'abort' # Abort on panic +strip = true # Strip symbols from binary diff --git a/kotlin/interop/build.rs b/kotlin/interop/build.rs new file mode 100644 index 0000000000..7cc75f8d3e --- /dev/null +++ b/kotlin/interop/build.rs @@ -0,0 +1,3 @@ +fn main() { + uniffi::generate_scaffolding("./src/babushka.udl").unwrap(); +} diff --git a/kotlin/interop/src/babushka.udl b/kotlin/interop/src/babushka.udl new file mode 100644 index 0000000000..3ce0ef3376 --- /dev/null +++ b/kotlin/interop/src/babushka.udl @@ -0,0 +1,18 @@ + +[Error] +enum BabushkaError { + "Oops", +}; + +namespace kotlibbabushka { + + [Throws=BabushkaError] + string static_function_which_throws(); + + string static_function(); +}; + +interface BabushkaClient { + constructor(); + string class_function(); +}; diff --git a/kotlin/interop/src/lib.rs b/kotlin/interop/src/lib.rs new file mode 100644 index 0000000000..b6b69b6fa2 --- /dev/null +++ b/kotlin/interop/src/lib.rs @@ -0,0 +1,28 @@ +uniffi::include_scaffolding!("babushka"); + +#[derive(Debug, thiserror::Error)] +pub enum BabushkaError { + #[error("...")] + Oops +} + +pub fn static_function_which_throws() -> Result { + Ok("hello from rust -> static function which throws".into()) +} + +pub fn static_function() -> String { + "hello from rust -> static function".into() +} + +pub struct BabushkaClient { +} + +impl BabushkaClient { + pub fn new() -> Self { + BabushkaClient { } + } + + pub fn class_function(&self) -> String { + "hello from rust -> class function".into() + } +} diff --git a/kotlin/interop/uniffi-bindgen.rs b/kotlin/interop/uniffi-bindgen.rs new file mode 100644 index 0000000000..f6cff6cf1d --- /dev/null +++ b/kotlin/interop/uniffi-bindgen.rs @@ -0,0 +1,3 @@ +fn main() { + uniffi::uniffi_bindgen_main() +} diff --git a/kotlin/interop/uniffi.toml b/kotlin/interop/uniffi.toml new file mode 100644 index 0000000000..d64e720f92 --- /dev/null +++ b/kotlin/interop/uniffi.toml @@ -0,0 +1,12 @@ +[bindings.kotlin] +package_name = "babushka" +cdylib_name = "kotlinbabushka" + +[bindings.python] +cdylib_name = "kotlinbabushka" + +[bindings.ruby] +cdylib_name = "kotlinbabushka" + +[bindings.swift] +cdylib_name = "kotlinbabushka" diff --git a/kotlin/plugin/build.gradle.kts b/kotlin/plugin/build.gradle.kts new file mode 100644 index 0000000000..8f78983141 --- /dev/null +++ b/kotlin/plugin/build.gradle.kts @@ -0,0 +1,18 @@ +repositories { + mavenCentral() + gradlePluginPortal() +} + +plugins { + id("java-gradle-plugin") + `kotlin-dsl` +} + +gradlePlugin { + plugins { + create("uniFfiJvmBindings") { + id = "babushka.plugin.generate-jvm-bindings" + implementationClass = "babushka.UniFfiJvmPlugin" + } + } +} diff --git a/kotlin/plugin/src/main/kotlin/babushka/Enums.kt b/kotlin/plugin/src/main/kotlin/babushka/Enums.kt new file mode 100644 index 0000000000..a8a7a8e7c8 --- /dev/null +++ b/kotlin/plugin/src/main/kotlin/babushka/Enums.kt @@ -0,0 +1,16 @@ +package babushka + + +val operatingSystem: OS = when { + System.getProperty("os.name").contains("mac", ignoreCase = true) -> OS.MAC + System.getProperty("os.name").contains("linux", ignoreCase = true) -> OS.LINUX + System.getProperty("os.name").contains("windows", ignoreCase = true) -> OS.WINDOWS + else -> OS.OTHER +} + +enum class OS { + MAC, + LINUX, + WINDOWS, + OTHER, +} diff --git a/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt b/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt new file mode 100644 index 0000000000..ac9e96100d --- /dev/null +++ b/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt @@ -0,0 +1,141 @@ +package babushka + +import org.gradle.api.DefaultTask +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.tasks.Exec +import org.gradle.kotlin.dsl.getValue +import org.gradle.kotlin.dsl.provideDelegate +import org.gradle.kotlin.dsl.register + +internal class UniFfiJvmPlugin : Plugin { + override fun apply(target: Project): Unit = target.run { +//* + // register a task called buildJvmBinaries which will run something like + // cargo build --release --target aarch64-apple-darwin + val buildJvmBinaries by tasks.register("buildJvmBinaries") { + if (operatingSystem == OS.MAC) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-apple-darwin") + args(cargoArgs) + } + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "aarch64-apple-darwin") + args(cargoArgs) + } + } else if (operatingSystem == OS.LINUX) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-unknown-linux-gnu") + args(cargoArgs) + } + } else if (operatingSystem == OS.WINDOWS) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-pc-windows-msvc") + args(cargoArgs) + } + } + } + + // move the native libs build by cargo from target/.../release/ + // to their place in the jvm library + val moveNativeJvmLibs by tasks.register("moveNativeJvmLibs") { + + // dependsOn(buildJvmBinaryX86_64MacOS, buildJvmBinaryAarch64MacOS, buildJvmBinaryLinux) + dependsOn(buildJvmBinaries) + + data class CopyMetadata(val targetDir: String, val ext: String) + val libsToCopy: MutableList = mutableListOf() + var resDir = "" + + if (operatingSystem == OS.MAC) { + resDir = "darwin-aarch64" + libsToCopy.add( + CopyMetadata( + targetDir = "aarch64-apple-darwin", + ext = "dylib" + ) + ) + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-apple-darwin", + ext = "dylib" + ) + ) + } else if (operatingSystem == OS.LINUX) { + resDir = "linux-x86-64" + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-unknown-linux-gnu", + ext = "so" + ) + ) + } else if (operatingSystem == OS.WINDOWS) { + resDir = "win32-x86-64" + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-pc-windows-msvc", + ext = "dll" + ) + ) + } + val libName = when (operatingSystem) { + OS.WINDOWS -> "kotlinbabushka" + else -> "libkotlinbabushka" + } + + val destDir = "$rootDir/client/src/main/resources/${resDir}/" + mkdir(destDir) + + libsToCopy.forEach { + doFirst { + copy { + with(it) { + from("$rootDir/interop/target/${this.targetDir}/release-smaller/${libName}.${this.ext}") + into(destDir) + } + } + } + } + } + + // generate the bindings using the bindgen tool + val generateJvmBindings by tasks.register("generateJvmBindings") { + + dependsOn(moveNativeJvmLibs) + + workingDir("$rootDir/interop") + val cargoArgs: List = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/babushka.udl", + "--language", "kotlin", "--out-dir", "../client/src/main/kotlin", "--no-format") + + executable("cargo") + args(cargoArgs) + + doLast { + println("JVM bindings file successfully created") + } + } +//*/ + // we need an aggregate task which will run the 3 required tasks to build the JVM libs in order + // the task will also appear in the printout of the ./gradlew tasks task with a group and description + tasks.register("buildJvmLib") { + group = "babushka" + description = "Aggregate task to build JVM library" + + dependsOn( + //* + buildJvmBinaries, + moveNativeJvmLibs, + generateJvmBindings + //*/ + ) + } + } +} diff --git a/kotlin/settings.gradle.kts b/kotlin/settings.gradle.kts new file mode 100644 index 0000000000..bd7df3933a --- /dev/null +++ b/kotlin/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = "kotlinbabushka" + +include("client") +includeBuild("plugin") diff --git a/submodules/redis-rs b/submodules/redis-rs index ad7dc114cf..ca6b9cb57a 160000 --- a/submodules/redis-rs +++ b/submodules/redis-rs @@ -1 +1 @@ -Subproject commit ad7dc114cf9ffa45a3d327610fb5873eebed5d7c +Subproject commit ca6b9cb57a78d9164febe3878eff68043ab5bed0