Feature/explicit jni target (#89)

* fix lints. make the jni target explicit

* bump to 0.3.0

* remove old dependency ci step

* fix lint

Author: jadamcrain

.github/workflows/ci.yml

@@ -5,45 +5,6 @@ on:
       - main
   pull_request:
 jobs:
-  # Check dependencies
-  dependencies:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          path: oo-bindgen
-      - name: Checkout complicense
-        uses: actions/checkout@v2
-        with:
-          repository: stepfunc/complicense
-          path: complicense
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: Caching
-        uses: Swatinem/rust-cache@v1
-      - name: Install cargo-license
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-license
-      - name: Generate dependencies.json
-        working-directory: oo-bindgen/oo-bindgen
-        run: cargo-license --avoid-dev-deps --avoid-build-deps -j > ../dependencies.json
-      - name: Generate dependencies.txt
-        working-directory: complicense
-        run: cargo run -- --import ../oo-bindgen/dependencies.json --config ../oo-bindgen/deps-config.json --token ${{ github.token }} > ../oo-bindgen/dependencies.txt
-      - name: Upload dependencies info
-        uses: actions/upload-artifact@v2
-        with:
-          name: dependencies
-          path: |
-            oo-bindgen/dependencies.json
-            oo-bindgen/dependencies.txt
   # Run the unit tests on Windows, Linux, and MacOS
   test:
     strategy:
@@ -321,7 +282,7 @@ jobs:
           path: tests/bindings/c/generated
   # Package all the generated bindings
   packaging:
-    needs: [dependencies, documentation, bindings-windows, bindings-macos, cross]
+    needs: [documentation, bindings-windows, bindings-macos, cross]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -334,10 +295,6 @@ jobs:
           override: true
       - name: Caching
         uses: Swatinem/rust-cache@v1
-      - name: Download dependencies
-        uses: actions/download-artifact@v2
-        with:
-          name: dependencies
       - name: Download compiled FFI
         uses: actions/download-artifact@v2
         with:
@@ -347,7 +304,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: run
-          args: --bin foo-bindings -- --package ./ffi-modules -f dependencies.txt
+          args: --bin foo-bindings -- --package ./ffi-modules
       - name: Upload .NET bindings
         uses: actions/upload-artifact@v2
         with:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ci-script"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Émile Grégoire <[email protected]>"]
 edition = "2021"
 

ci-script/Cargo.toml

@@ -140,6 +140,8 @@ fn ffi_path() -> PathBuf {
 pub struct BindingBuilderSettings {
     /// FFI target name (as specified in with `cargo build -p <...>`)
     pub ffi_target_name: &'static str,
+    /// JNI target name (as specified in with `cargo build -p <...>`)
+    pub jni_target_name: &'static str,
     /// Compiled FFI name (usually the same as `ffi_target_name`, but with hyphens replaced by underscores)
     pub ffi_name: &'static str,
     /// Path to the FFI target
@@ -421,9 +423,7 @@ impl BindingBuilder for JavaBindingBuilder {
         if !is_packaging {
             let mut cmd = Command::new("cargo");
 
-            let java_target = format!("{}_java", self.settings.ffi_name);
-
-            cmd.args(&["build", "-p", &java_target]);
+            cmd.args(&["build", "-p", self.settings.jni_target_name]);
 
             if env!("PROFILE") == "release" {
                 cmd.arg("--release");

ci-script/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "c-oo-bindgen"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Émile Grégoire <[email protected]>"]
 edition = "2021"
 

generators/c-oo-bindgen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dotnet-oo-bindgen"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Émile Grégoire <[email protected]>"]
 edition = "2021"
 

generators/dotnet-oo-bindgen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "java-oo-bindgen"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Émile Grégoire <[email protected]>"]
 edition = "2021"
 

generators/java-oo-bindgen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust-oo-bindgen"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Émile Grégoire <[email protected]>"]
 edition = "2021"