Util cargo alias config and cargo-make to gen kotlin

redbadger · Jul 25, 2024 · b055ea3 · b055ea3
1 parent 01a712a
commit b055ea3
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 15 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,2 +1,3 @@
 [alias]
 xcode = ["bin", "cargo-xcode"]
+make = ["bin", "cargo-make"]
diff --git a/examples/simple_counter/.cargo/config.toml b/examples/simple_counter/.cargo/config.toml
diff --git a/examples/simple_counter/Android/shared/build.gradle b/examples/simple_counter/Android/shared/build.gradle
@@ -84,26 +84,21 @@ afterEvaluate {
 
 tasks.register('bindGen', Exec) {
     def outDir = "${projectDir}/../../shared/generated/java"
-    workingDir "../../"
+    workingDir "../../shared"
     if (System.getProperty('os.name').toLowerCase().contains('windows')) {
         commandLine("cmd", "/c",
-                "cargo build -p shared && " + "target\\debug\\uniffi-bindgen generate --library target\\debug\\libshared.dylib " + "--language kotlin " + "--out-dir " + outDir.replace('/', '\\'))
+                "cargo make uniffi-gen-java")
     } else {
         commandLine("sh", "-c",
-                """\
-                cargo build -p shared && \
-                target/debug/uniffi-bindgen generate --library target/debug/libshared.dylib \
-                --language kotlin \
-                --out-dir $outDir
-                """)
+                "cargo make uniffi-gen-java")
     }
 }
 
 tasks.register('typesGen', Exec) {
-    workingDir "../../"
+    workingDir "../../shared"
     if (System.getProperty('os.name').toLowerCase().contains('windows')) {
-        commandLine("cmd", "/c", "cargo run --bin generate-types --features typegen")
+        commandLine("cmd", "/c", "cargo make generate-types")
     } else {
-        commandLine("sh", "-c", "cargo run --bin generate-types --features typegen")
+        commandLine("sh", "-c", "cargo make generate-types")
     }
 }
diff --git a/examples/simple_counter/Cargo.toml b/examples/simple_counter/Cargo.toml
@@ -19,3 +19,4 @@ uniffi = { git = "https://github.com/mozilla/uniffi-rs.git", branch = "main" }
 
 [workspace.metadata.bin]
 cargo-xcode = { version = "=1.7.0" }
+cargo-make = { version = "=0.37.14" }
diff --git a/examples/simple_counter/shared/.cargo/config.toml b/examples/simple_counter/shared/.cargo/config.toml
@@ -0,0 +1,5 @@
+[alias]
+generate-types = "run --bin generate-types --features typegen"
+uniffi-bindgen = "run --bin uniffi-bindgen"
+uniffi-gen-swift = "uniffi-bindgen generate --language swift"
+uniffi-gen-kotlin = "uniffi-bindgen generate --language kotlin"
diff --git a/examples/simple_counter/shared/Makefile.toml b/examples/simple_counter/shared/Makefile.toml
@@ -0,0 +1,36 @@
+[env]
+CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
+
+[tasks.build]
+command = "cargo"
+args = ["build", "-p", "shared", "--release"]
+
+[tasks.uniffi-gen-swift]
+command = "cargo"
+args = [
+  "uniffi-gen-swift",
+  "--library",
+  "${CARGO_MAKE_CRATE_TARGET_DIRECTORY}/release/libshared.dylib",
+  "--out-dir",
+  "generated/swift/SharedFFI",
+]
+dependencies = ["build"]
+
+[tasks.build-android]
+command = "cargo"
+args = ["build", "-p", "shared", "--target", "aarch64-linux-android"]
+
+[tasks.uniffi-gen-java]
+command = "cargo"
+args = [
+  "uniffi-gen-kotlin",
+  "--library",
+  "${CARGO_MAKE_CRATE_TARGET_DIRECTORY}/aarch64-linux-android/debug/libshared.so",
+  "--out-dir",
+  "generated/java",
+]
+dependencies = ["build-android"]
+
+[tasks.generate-types]
+command = "cargo"
+args = ["generate-types"]