Fix CI and bump version

.github/workflows/ci.yml

@@ -1,5 +1,4 @@
 name: CI
-
 on:
   push:
     branches: [main]
@@ -12,9 +11,7 @@ on:
     - '.github/workflows/ci.yml'
     - '**.rs'
     - '**.toml'
-
 jobs:
-
   android-build-ubuntu:
     name: Build Android example on Ubuntu latest
     runs-on: ubuntu-latest

.github/workflows/docker.yml

@@ -1,14 +1,11 @@
 name: Docker images
-
 on:
   push:
     branches: [main]
     paths:
     - '.github/docker/*.Dockerfile'
     - '.github/workflows/docker.yml'
-
 jobs:
-
   build-crossbundle-dockerfile:
     name: Build Crossbundle Dockerfile
     runs-on: ubuntu-latest

.github/workflows/publish.yml

@@ -1,12 +1,8 @@
-
 name: Build and publish
-
 on:
   push:
     tags: ['v*']
-
 jobs:
-
   build-and-publish-to-crates-io:
     name: Build and publish to crates.io
     runs-on: macos-latest
@@ -39,7 +35,7 @@ jobs:
     - name: Install cargo make
       run: cargo install cargo-make
     - name: Build binary
-      run: cargo make zip-release -e CARGO_MAKE_RELEASE_FLOW_TARGET=${{ matrix.binary_target }}
+      run: cargo make -e CARGO_MAKE_RELEASE_FLOW_TARGET=${{ matrix.binary_target }} zip-release
     - name: Upload zip file
       uses: svenstaro/upload-release-action@v2
       with:
@@ -49,24 +45,25 @@ jobs:
         overwrite: true
         file_glob: true
 
-  # build-and-publish-release-examples:
-  #   name: Build and publish examples to Github release
-  #   needs: build-and-publish-to-crates-io
-  #   runs-on: macos-latest
-  #   steps:
-  #   - uses: actions/checkout@master
-  #   - name: Install cargo make
-  #     run: cargo install cargo-make
-  #   - name: Build binary
-  #     run: |
-  #       cargo install --git=https://github.com/dodorare/crossbow --branch=main crossbundle
-  #       rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
-  #       cargo make build-release-examples
-  #   - name: Upload zip file
-  #     uses: svenstaro/upload-release-action@v2
-  #     with:
-  #       repo_token: ${{ secrets.GITHUB_TOKEN }}
-  #       file: 'target/apks/*.apk'
-  #       tag: ${{ github.ref }}
-  #       overwrite: true
-  #       file_glob: true
+  build-and-publish-release-examples:
+    name: Build and publish examples to Github release
+    needs: build-and-publish-to-crates-io
+    if: false # TODO: Finish examples and enable this
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install cargo make
+      run: cargo install cargo-make
+    - name: Build binary
+      run: |
+        cargo install --git=https://github.com/dodorare/crossbow --branch=main crossbundle
+        rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
+        cargo make build-release-examples
+    - name: Upload zip file
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: 'target/apks/*.apk'
+        tag: ${{ github.ref }}
+        overwrite: true
+        file_glob: true

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crossbow"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["DodoRare Team <[email protected]>"]
 description = "Cross-Platform Rust Toolkit for Games 🏹"
@@ -11,11 +11,11 @@ readme = "README.md"
 exclude = [".github/**/*"]
 
 [dependencies]
-crossbundle-derive = { path = "crossbundle/derive", version = "0.1.0" }
-crossbundle-tools = { path = "crossbundle/tools", version = "0.1.0", optional = true }
+crossbundle-derive = { path = "crossbundle/derive", version = "0.1.1" }
+crossbundle-tools = { path = "crossbundle/tools", version = "0.1.1", optional = true }
 
-crossbow-ads = { path = "plugins/ads", version = "0.1.0", optional = true }
-crossbow-permissions = { path = "plugins/permissions", version = "0.1.0", optional = true }
+crossbow-ads = { path = "plugins/ads", version = "0.1.1", optional = true }
+crossbow-permissions = { path = "plugins/permissions", version = "0.1.1", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-glue = { git = "https://github.com/rust-windowing/android-ndk-rs" }

crossbundle/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crossbundle"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["DodoRare Team <[email protected]>"]
 description = "Build and publish apps for Android/iOS"
@@ -22,9 +22,9 @@ name = "cargo-crossbundle"
 path = "src/main.rs"
 
 [dependencies]
-crossbundle-tools = { path = "../tools", version = "0.1.0" }
+crossbundle-tools = { path = "../tools", version = "0.1.1" }
 
-clap = { git = "https://github.com/clap-rs/clap", rev = "33d86effc9b34e207268977ba45c97f80b3f1b57" }
+clap = { version = "3.0.5", features = ["derive"] }
 cargo_toml = "0.10.1"
 serde = { version = "1.0", features = ["derive"] }
 dunce = "1.0"

crossbundle/derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crossbundle-derive"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["DodoRare Team <[email protected]>"]
 description = "Cross-Platform Rust Toolkit for Games 🏹"

crossbundle/tools/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crossbundle-tools"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["DodoRare Team <[email protected]>"]
 description = "Build and publish apps for Android/iOS"
@@ -32,7 +32,7 @@ zip = "0.5.13"
 zip-extensions = "0.6"
 tempfile = "3.2"
 
-cargo = "0.57.0"
+cargo = "0.58.0"
 cargo-util = "0.1.1"
 
 [target.'cfg(unix)'.dependencies]

examples/bevy-2d/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "bevy-2d"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["DodoRare Team <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-crossbow = { version = "0.1.0", path = "../../" }
+crossbow = { version = "0.1.1", path = "../../" }
 log = "0.4"
 anyhow = "1.0"
 bevy = { version = "0.6.0", features = ["mp3"] }

examples/bevy-3d/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "bevy-3d"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["DodoRare Team <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-crossbow = { version = "0.1.0", path = "../../" }
+crossbow = { version = "0.1.1", path = "../../" }
 log = "0.4"
 anyhow = "1.0"
 bevy = "0.6.0"

examples/macroquad-3d/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "macroquad-3d"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["DodoRare Team <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-crossbow = { version = "0.1.0", path = "../../" }
+crossbow = { version = "0.1.1", path = "../../" }
 log = "0.4"
 anyhow = "1.0"
 macroquad = "0.3"

plugins/ads/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crossbow-ads"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["DodoRare Team <[email protected]>"]
 description = "Cross-Platform Rust Toolkit for Games 🏹"

plugins/permissions/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crossbow-permissions"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["DodoRare Team <[email protected]>"]
 description = "Cross-Platform Rust Toolkit for Games 🏹"