Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions apk/src/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ pub struct AndroidManifest {
#[serde(rename(serialize = "uses-sdk"))]
#[serde(default)]
pub sdk: Sdk,
#[serde(rename(serialize = "xmlns:tools"))]
pub xmlns_tools: Option<String>,
#[serde(rename(serialize = "uses-feature"))]
#[serde(default)]
pub uses_feature: Vec<Feature>,
#[serde(rename(serialize = "tools:replace"))]
pub tools_replace: Option<String>,
#[serde(rename(serialize = "uses-permission"))]
#[serde(default)]
pub uses_permission: Vec<Permission>,
Expand All @@ -46,6 +50,8 @@ impl Default for AndroidManifest {
uses_feature: Default::default(),
uses_permission: Default::default(),
application: Default::default(),
xmlns_tools: Default::default(),
tools_replace: Default::default(),
compile_sdk_version: Default::default(),
compile_sdk_version_codename: Default::default(),
platform_build_version_code: Default::default(),
Expand Down Expand Up @@ -82,6 +88,8 @@ pub struct Application {
#[serde(rename(serialize = "activity"))]
#[serde(default)]
pub activities: Vec<Activity>,
#[serde(rename(serialize = "tools:replace"))]
pub tools_replace: Option<String>,
}

/// Android [activity element](https://developer.android.com/guide/topics/manifest/activity-element).
Expand Down
2 changes: 2 additions & 0 deletions xbuild/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,8 @@ pub struct AndroidConfig {
pub manifest: AndroidManifest,
#[serde(default)]
pub dependencies: Vec<String>,
#[serde(default)]
pub aars: Vec<String>,
/// Defaults to [`false`], but uses [`true`] when the user builds a format that requires
/// `gradle` (i.e. [`Format::Aab`]).
#[serde(default)]
Expand Down
7 changes: 6 additions & 1 deletion xbuild/src/gradle/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ pub fn build(env: &BuildEnv, libraries: Vec<(Target, PathBuf)>, out: &Path) -> R
dependencies.push_str(&format!("implementation '{dep}'\n"));
}

for aar in &config.aars {
let aar = env.root_dir().join(aar).as_os_str().to_str().unwrap().to_string();
dependencies.push_str(&format!("implementation files('{aar}.aar')\n"));
}

let asset_packs = if config.assets.is_empty() {
""
} else {
Expand All @@ -90,12 +95,12 @@ pub fn build(env: &BuildEnv, libraries: Vec<(Target, PathBuf)>, out: &Path) -> R
}}
{asset_packs}
}}

dependencies {{
{dependencies}
}}
"#,
);

let pack_name = "baseAssets";
let base_assets = gradle.join(pack_name);
// Make sure that any possibly-obsolete asset pack does not clobber the build
Expand Down
3 changes: 3 additions & 0 deletions xbuild/src/gradle/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ pluginManagement {
gradlePluginPortal()
google()
mavenCentral()
flatDir {
dirs 'libs'
}
}
}
dependencyResolutionManagement {
Expand Down
Loading