Skip to content

Commit c18a5ee

Browse files
Heezayenfipy
Heezay
and
enfipy
authored
Add win latest check (#150)
* Fix crossbundle install --preferred problem * Add win latest check * Fix small syntax issue * Alter CI.yml * Fix CI * Fix syntax error * Change ci code * Try to build gradle-apk * Bump version * Fix yml syntax * Fix syntax * Remove unused code * Fix CI * Alter example in CI Co-authored-by: David Ackerman <enfipy@gmail.com>
1 parent 7e5e050 commit c18a5ee

File tree

26 files changed

+80
-51
lines changed

26 files changed

+80
-51
lines changed

‎.github/workflows/ci.yml

+25
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,31 @@ jobs:
3030
export ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME
3131
crossbundle build android -s=native-apk --release
3232
33+
android-build-windows:
34+
name: Build Android example on Windows latest
35+
runs-on: windows-latest
36+
steps:
37+
- uses: actions/checkout@master
38+
- name: Install Android targets and upgrade rust
39+
run: |
40+
rustup upgrade
41+
rustup target add aarch64-linux-android x86_64-linux-android
42+
- name: Set up JDK 11
43+
uses: actions/setup-java@v3
44+
with:
45+
distribution: adopt
46+
java-version: 11
47+
- name: Install Crossbundle
48+
run: |
49+
cargo install --path=./crossbundle/cli
50+
crossbundle install --preferred
51+
- name: Build APK
52+
run: |
53+
cd examples/macroquad-permissions
54+
setx ANDROID_SDK_ROOT "$HOME/AppData/Local/Android/Sdk" /M
55+
setx ANDROID_NDK_ROOT "$HOME/AppData/Local/Android/Sdk/ndk/23.1.7779620" /M
56+
crossbundle build android --release
57+
3358
apple-build-macos:
3459
name: Build Apple example on macOS latest
3560
runs-on: macos-latest

‎Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbow"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Cross-Platform build tools and toolkit for games"
@@ -21,10 +21,10 @@ apple-bundle = { version = "0.1.4", optional = true }
2121

2222
[target.'cfg(target_os = "android")'.dependencies]
2323
ndk-glue = "0.7.0"
24-
crossbow-android = { path = "platform/android", version = "0.2.1", optional = true }
24+
crossbow-android = { path = "platform/android", version = "0.2.2", optional = true }
2525

2626
[target.'cfg(target_os = "ios")'.dependencies]
27-
crossbow-ios = { path = "platform/ios", version = "0.2.1", optional = true }
27+
crossbow-ios = { path = "platform/ios", version = "0.2.2", optional = true }
2828

2929
[patch.crates-io]
3030
miniquad = { git = "https://github.com/not-fl3/miniquad", rev = "d67ffe6950cf73df307e2d23aaa4726f14399985" }

‎crossbundle/cli/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbundle"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Build and publish apps for Android/iOS"
@@ -18,8 +18,8 @@ name = "crossbundle"
1818
path = "src/main.rs"
1919

2020
[dependencies]
21-
crossbow = { path = "../../", version = "0.2.1", default-features = false, features = ["update-manifest"] }
22-
crossbundle-tools = { path = "../tools", version = "0.2.1", default-features = false }
21+
crossbow = { path = "../../", version = "0.2.2", default-features = false, features = ["update-manifest"] }
22+
crossbundle-tools = { path = "../tools", version = "0.2.2", default-features = false }
2323
android-tools = { version = "0.2.11", optional = true }
2424
clap = { version = "3.2", features = ["derive"] }
2525
serde = { version = "1.0", features = ["derive"] }

‎crossbundle/cli/src/commands/install/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ impl InstallCommand {
4848
#[cfg(feature = "android")]
4949
CommandLineToolsInstallCommand::default().install(config)?;
5050
#[cfg(feature = "android")]
51-
BundletoolInstallCommand::default().install(config)?;
51+
BundletoolInstallCommand {
52+
version: String::from("1.8.2"),
53+
..Default::default()
54+
}
55+
.install(config)?;
5256
#[cfg(feature = "android")]
5357
SdkManagerInstallCommand {
5458
preferred_tools: true,

‎crossbundle/tools/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbundle-tools"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Build and publish apps for Android/iOS"
@@ -10,7 +10,7 @@ keywords = ["android", "ios"]
1010
readme = "README.md"
1111

1212
[dependencies]
13-
crossbow-android = { version = "0.2.1", path = "../../platform/android", default-features = false, features = ["embed"] }
13+
crossbow-android = { version = "0.2.2", path = "../../platform/android", default-features = false, features = ["embed"] }
1414
# Apple crates
1515
apple-bundle = { version = "0.1.4", optional = true }
1616
simctl = { version = "0.1.1", package = "creator-simctl", optional = true }

‎docs/src/crossbow/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ authors = ["Example <example@example.com>"]
1212
edition = "2021"
1313

1414
[dependencies]
15-
crossbow = "0.2.1"
15+
crossbow = "0.2.2"
1616

1717
[package.metadata]
1818
app_name = "Game"

‎examples/bevy-2d/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "bevy-2d"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2021"
66

77
[dependencies]
8-
crossbow = { version = "0.2.1", path = "../../" }
8+
crossbow = { version = "0.2.2", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
bevy = { version = "0.8.0", default-features = false, features = ["bevy_winit", "render", "bevy_asset"] }

‎examples/bevy-explorer/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "bevy-explorer"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2021"
66

77
[dependencies]
8-
crossbow = { version = "0.2.1", path = "../../" }
8+
crossbow = { version = "0.2.2", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
subxt = "0.21"

‎examples/crossbow-plugins/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[package]
22
name = "crossbow-plugins"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2021"
66

77
[dependencies]
8-
crossbow = { version = "0.2.1", path = "../../" }
8+
crossbow = { version = "0.2.2", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
macroquad = "=0.3.7"
1212

1313
[target.'cfg(target_os = "android")'.dependencies]
14-
play-core = { version = "0.2.1", path = "../../plugins/play-core" }
15-
play-billing = { version = "0.2.1", path = "../../plugins/play-billing" }
16-
play-games-services = { version = "0.2.1", path = "../../plugins/play-games-services" }
14+
play-core = { version = "0.2.2", path = "../../plugins/play-core" }
15+
play-billing = { version = "0.2.2", path = "../../plugins/play-billing" }
16+
play-games-services = { version = "0.2.2", path = "../../plugins/play-games-services" }
1717

1818
[package.metadata]
1919
app_name = "Crossbow Plugins"

‎examples/macroquad-3d/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "macroquad-3d"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2021"
66

77
[dependencies]
8-
crossbow = { version = "0.2.1", path = "../../" }
8+
crossbow = { version = "0.2.2", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
macroquad = "=0.3.7"

‎examples/macroquad-permissions/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[package]
22
name = "macroquad-permissions"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
authors = ["DodoRare Team <support@dodorare.com>"]
55
edition = "2021"
66

77
[dependencies]
8-
crossbow = { version = "0.2.1", path = "../../" }
8+
crossbow = { version = "0.2.2", path = "../../" }
99
log = "0.4"
1010
anyhow = "1.0"
1111
macroquad = "=0.3.7"
1212

1313
[target.'cfg(target_os = "android")'.dependencies]
14-
admob-android = { version = "0.2.1", path = "../../plugins/admob-android" }
14+
admob-android = { version = "0.2.2", path = "../../plugins/admob-android" }
1515

1616
[package.metadata]
1717
app_name = "Permissions"

‎platform/android/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbow-android"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Cross-Platform build tools and toolkit for games"

‎platform/android/java/app/config.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext.versions = [
2-
crossbowLibrary : "0.2.1",
2+
crossbowLibrary : "0.2.2",
33
androidGradlePlugin: "7.0.0",
44
compileSdk : 31,
55
minSdk : 19,

‎platform/ios/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossbow-ios"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Cross-Platform build tools and toolkit for games"

‎plugins/admob-android/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "admob-android"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "AdMob Plugin for Crossbow"
@@ -11,4 +11,4 @@ readme = "README.md"
1111
exclude = ["android/"]
1212

1313
[dependencies]
14-
crossbow-android = { path = "../../platform/android", version = "0.2.1" }
14+
crossbow-android = { path = "../../platform/android", version = "0.2.2" }

‎plugins/admob-android/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ Just add Rust dependencies like this:
2727

2828
```toml
2929
[dependencies]
30-
crossbow = "0.2.1"
30+
crossbow = "0.2.2"
3131
[target.'cfg(target_os = "android")'.dependencies]
32-
admob-android = "0.2.1"
32+
admob-android = "0.2.2"
3333
```
3434

3535
And finally, add this to your Crossbow Android configuration:
3636

3737
```toml
3838
[package.metadata.android]
39-
plugins_remote = ["com.crossbow.admob:admob:0.2.1"]
39+
plugins_remote = ["com.crossbow.admob:admob:0.2.2"]
4040
```
4141

4242
> That's it, now you can start using AdMob ads!

‎plugins/admob-android/android/config.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext.versions = [
2-
crossbowLibrary : "0.2.1",
2+
crossbowLibrary : "0.2.2",
33
androidGradlePlugin: "7.0.0",
44
compileSdk : 31,
55
minSdk : 19,

‎plugins/play-billing/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "play-billing"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Google Play Billing Plugin for Crossbow"
@@ -11,4 +11,4 @@ readme = "README.md"
1111
exclude = ["android/"]
1212

1313
[dependencies]
14-
crossbow-android = { path = "../../platform/android", version = "0.2.1" }
14+
crossbow-android = { path = "../../platform/android", version = "0.2.2" }

‎plugins/play-billing/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ Just add Rust dependencies like this:
1717

1818
```toml
1919
[dependencies]
20-
crossbow = "0.2.1"
20+
crossbow = "0.2.2"
2121
[target.'cfg(target_os = "android")'.dependencies]
22-
play-billing = "0.2.1"
22+
play-billing = "0.2.2"
2323
```
2424

2525
And finally, add this to your Crossbow Android configuration:
2626

2727
```toml
2828
[package.metadata.android]
29-
plugins_remote = ["com.crossbow.play_billing:play_billing:0.2.1"]
29+
plugins_remote = ["com.crossbow.play_billing:play_billing:0.2.2"]
3030
```
3131

3232
> That's it, now you can start using Play Billing!

‎plugins/play-billing/android/config.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext.versions = [
2-
crossbowLibrary : "0.2.1",
2+
crossbowLibrary : "0.2.2",
33
androidGradlePlugin: "7.0.0",
44
compileSdk : 31,
55
minSdk : 19,

‎plugins/play-core/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "play-core"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Google Play Core Plugin for Crossbow"
@@ -11,4 +11,4 @@ readme = "README.md"
1111
exclude = ["android/"]
1212

1313
[dependencies]
14-
crossbow-android = { path = "../../platform/android", version = "0.2.1" }
14+
crossbow-android = { path = "../../platform/android", version = "0.2.2" }

‎plugins/play-core/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ Just add Rust dependencies like this:
1717

1818
```toml
1919
[dependencies]
20-
crossbow = "0.2.1"
20+
crossbow = "0.2.2"
2121
[target.'cfg(target_os = "android")'.dependencies]
22-
play-core = "0.2.1"
22+
play-core = "0.2.2"
2323
```
2424

2525
And finally, add this to your Crossbow Android configuration:
2626

2727
```toml
2828
[package.metadata.android]
29-
plugins_remote = ["com.crossbow.play_core:play_core:0.2.1"]
29+
plugins_remote = ["com.crossbow.play_core:play_core:0.2.2"]
3030
```
3131

3232
> That's it, now you can start using Play Core!

‎plugins/play-core/android/config.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext.versions = [
2-
crossbowLibrary : "0.2.1",
2+
crossbowLibrary : "0.2.2",
33
androidGradlePlugin: "7.0.0",
44
compileSdk : 31,
55
minSdk : 19,

‎plugins/play-games-services/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "play-games-services"
3-
version = "0.2.1"
3+
version = "0.2.2"
44
edition = "2021"
55
authors = ["DodoRare Team <support@dodorare.com>"]
66
description = "Google Play Games Services Plugin for Crossbow"
@@ -11,4 +11,4 @@ readme = "README.md"
1111
exclude = ["android/"]
1212

1313
[dependencies]
14-
crossbow-android = { path = "../../platform/android", version = "0.2.1" }
14+
crossbow-android = { path = "../../platform/android", version = "0.2.2" }

‎plugins/play-games-services/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ Just add Rust dependencies like this:
2929

3030
```toml
3131
[dependencies]
32-
crossbow = "0.2.1"
32+
crossbow = "0.2.2"
3333
[target.'cfg(target_os = "android")'.dependencies]
34-
play-games-services = "0.2.1"
34+
play-games-services = "0.2.2"
3535
```
3636

3737
And finally, add this to your Crossbow Android configuration:
3838

3939
```toml
4040
[package.metadata.android]
41-
plugins_remote = ["com.crossbow.play_games_services:play_games_services:0.2.1"]
41+
plugins_remote = ["com.crossbow.play_games_services:play_games_services:0.2.2"]
4242
```
4343

4444
## Getting started

‎plugins/play-games-services/android/config.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ext.versions = [
2-
crossbowLibrary : "0.2.1",
2+
crossbowLibrary : "0.2.2",
33
androidGradlePlugin: "7.0.0",
44
compileSdk : 31,
55
minSdk : 19,

0 commit comments

Comments
 (0)