Add GameActivity/Gradle project support

.gitignore

@@ -18,9 +18,6 @@ out/
 #  Uncomment the following line in case you need and you don't have the release build type files in your app
 # release/
 
-# Gradle files
-.gradle/
-
 # Local configuration file (sdk path, etc)
 local.properties
 
@@ -393,9 +390,6 @@ $RECYCLE.BIN/
 
 # Generated files
 
-# Gradle files
-.gradle
-
 # Signing files
 .signing/
 
@@ -406,11 +400,10 @@ $RECYCLE.BIN/
 # Log Files
 
 # Android Studio
-/*/build/
-/*/local.properties
-/*/out
-/*/*/build
-/*/*/production
+build/
+local.properties
+out
+production
 *.ipr
 *.swp
 
@@ -481,3 +474,26 @@ fabric.properties
 
 # Temporary files
 *.tmp
+
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath

Cargo.toml

@@ -14,8 +14,8 @@ exclude = [".github/**/*"]
 crossbundle-derive = { path = "crossbundle/derive", version = "0.1.3" }
 crossbundle-tools = { path = "crossbundle/tools", version = "0.1.3", optional = true }
 
-crossbow-ads = { path = "plugins/ads", version = "0.1.3", optional = true }
-crossbow-permissions = { path = "plugins/permissions", version = "0.1.3", optional = true }
+# Platform-specific dependencies
+crossbow-android = { path = "platform/android", version = "0.1.3", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-glue = "0.6.2"
@@ -28,10 +28,12 @@ miniquad = { git = "https://github.com/not-fl3/miniquad", rev = "d67ffe6950cf73d
 
 [features]
 default = []
+android = ["crossbow-android"]
 
 [workspace]
 members = [
     "plugins/*",
     "crossbundle/*",
+    "platform/*",
     "examples/*",
 ]

README.md

@@ -22,11 +22,10 @@ Crate structure:
 | Name | Description | Status |
 | ---- | ----------- | ------ |
 | [crossbundle](./crossbundle/cli/README.md) | Command-line tool for building applications | ✅ |
-| [crossbundle-install](https://github.com/dodorare/crossbow/blob/improve-documentation/docs/crossbundle-install-command.md) | Crossbundle install command to install necessary packages  | ✅ |
+| [crossbundle-install](./docs/crossbundle-install-command.md) | Crossbundle install command to install necessary packages  | ✅ |
 | [crossbundle-tools](./crossbundle/tools/README.md) | Toolkit used in `crossbundle` to build/pack/sign bundles | ✅ |
 | [crossbundle-derive](./crossbundle/derive/README.md) | Derive macros for projects built with `crossbow` | ✅ |
 | [crossbow-ads](./crossbow/ads/README.md) | Plugin for advertisements | 🛠 |
-| [crossbow-permissions](./crossbow/permissions/README.md) | Plugin for runtime permissions | 🛠 |
 | [android-tools-rs](https://github.com/dodorare/android-tools-rs) | Android-related tools for building and developing application | ✅ |
 | [android-manifest-rs](https://github.com/dodorare/android-manifest-rs) | [AndroidManifest](https://developer.android.com/guide/topics/manifest/manifest-intro) serializer and deserializer for Rust | ✅ |
 | [apple-bundle-rs](https://github.com/dodorare/apple-bundle-rs) | [AppleBundleResources](https://developer.apple.com/documentation/bundleresources) serializer and deserializer for Rust | ✅ |

crossbundle/cli/Cargo.toml

@@ -23,20 +23,22 @@ path = "src/main.rs"
 
 [dependencies]
 crossbundle-tools = { path = "../tools", version = "0.1.3" }
-clap = { version = "3.1", features = ["derive"] }
+android-tools = "0.2.8"
+clap = { version = "3.2.8", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
-dunce = "1.0"
+
 thiserror = "1.0"
 colored = "2.0"
-displaydoc = "0.1"
+displaydoc = "0.2"
 pretty_env_logger = "0.4"
 log = "0.4"
+
 fs_extra = "1.2"
-android-tools = "0.2.7"
 dirs = "4.0.0"
+dunce = "1.0"
 ureq = "2.4.0"
-cargo = "0.61.1"
-cargo-util = "0.1.1"
+cargo = "0.63.1"
+cargo-util = "0.2.0"
 
 [features]
 default = ["android", "ios"]

crossbundle/cli/README.md

@@ -72,8 +72,8 @@ use_info_plist = true
 # Path to Info.plist file
 info_plist_path = "path/to/Info.plist"
 
-# Android package name to place in AndroidManifest.xml.
-android_package_name = "com.example.Example"
+# Android package to place in AndroidManifest.xml.
+android_package = "com.example.ExampleProject"
 # Android resources directory path relatively to project path.
 android_res = "res/android"
 # Android assets directory path relatively to project path.

crossbundle/cli/src/cargo_manifest.rs

@@ -1,5 +1,7 @@
 use crossbundle_tools::types::{
-    android_manifest::{Service, UsesFeature, UsesPermission, UsesPermissionSdk23},
+    android_manifest::{
+        MetaData, Queries, Service, UsesFeature, UsesPermission, UsesPermissionSdk23,
+    },
     *,
 };
 use serde::{Deserialize, Serialize};
@@ -24,7 +26,7 @@ pub struct Metadata {
     pub info_plist_path: Option<PathBuf>,
 
     /// Android package name to place in AndroidManifest.xml.
-    pub android_package_name: Option<String>,
+    pub android_package: Option<String>,
     /// Android resources directory path relatively to project path.
     pub android_res: Option<PathBuf>,
     /// Android assets directory path relatively to project path.
@@ -43,6 +45,10 @@ pub struct Metadata {
 
     /// Android service to place in AndroidManifest.xml.
     pub android_service: Option<Vec<Service>>,
+    /// Android application meta_data to place in AndroidManifest.xml.
+    pub android_meta_data: Option<Vec<MetaData>>,
+    /// Android queries to place in AndroidManifest.xml.
+    pub android_queries: Option<Queries>,
 
     /// Apple build targets.
     pub apple_build_targets: Option<Vec<AppleTarget>>,