refactor!: use tauri.conf.json > identifier as package name and bundle id, close #9851 (#9858)

* fix(android): use identifier as Android package name

* update android_binding and android_fn interface

* chore: rename TAURI_ANDROID_PACKAGE_PREFIX to TAURI_ANDROID_PACKAGE_NAME

* revert back to split prefix and app_name

* rename `domain` to `identifier`

* add change log

* simplify reverse config identifier

* Update .changes/mobile-use-identifier-as-id.md

* Update core/tauri-build/src/lib.rs

* lint

* cargo-mobile2 0.12

* fmt

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.app>

Author: pewsheen

.changes/mobile-use-identifier-as-id.md

@@ -0,0 +1,9 @@
+---
+"tauri": patch:breaking
+"tauri-build": patch:breaking
+"tauri-cli": patch:breaking
+"@tauri-apps/cli": patch:breaking
+"tauri-macros": patch:breaking
+---
+
+Use `tauri.conf.json > identifier` to set the `PackageName` in Android and `BundleId` in iOS.

core/tauri-build/src/lib.rs

@@ -459,13 +459,15 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
   let last = s.clone().count() - 1;
   let mut android_package_prefix = String::new();
   for (i, w) in s.enumerate() {
-    if i == 0 || i != last {
+    if i == last {
+      println!("cargo:rustc-env=TAURI_ANDROID_PACKAGE_NAME_APP_NAME={}", w);
+    } else {
       android_package_prefix.push_str(w);
       android_package_prefix.push('_');
     }
   }
   android_package_prefix.pop();
-  println!("cargo:rustc-env=TAURI_ANDROID_PACKAGE_PREFIX={android_package_prefix}");
+  println!("cargo:rustc-env=TAURI_ANDROID_PACKAGE_NAME_PREFIX={android_package_prefix}");
 
   if let Some(project_dir) = var_os("TAURI_ANDROID_PROJECT_PATH").map(PathBuf::from) {
     mobile::generate_gradle_files(project_dir)?;

core/tauri-macros/src/mobile.rs

@@ -37,9 +37,14 @@ pub fn entry_point(_attributes: TokenStream, item: TokenStream) -> TokenStream {
   let function_name = &function.sig.ident;
 
   let mut error = None;
-  let domain = get_env_var("TAURI_ANDROID_PACKAGE_PREFIX", |r| r, &mut error, &function);
+  let domain = get_env_var(
+    "TAURI_ANDROID_PACKAGE_NAME_PREFIX",
+    |r| r,
+    &mut error,
+    &function,
+  );
   let app_name = get_env_var(
-    "CARGO_PKG_NAME",
+    "TAURI_ANDROID_PACKAGE_NAME_APP_NAME",
     |r| r.replace('-', "_"),
     &mut error,
     &function,

core/tauri/src/lib.rs

@@ -129,17 +129,17 @@ pub type WryHandle = tauri_runtime_wry::WryHandle<EventLoopMessage>;
 #[doc(hidden)]
 #[macro_export]
 macro_rules! android_binding {
-  ($domain:ident, $package:ident, $main: ident, $wry: path) => {
+  ($domain:ident, $app_name:ident, $main:ident, $wry:path) => {
     use $wry::{
       android_setup,
       prelude::{JClass, JNIEnv, JString},
     };
 
-    ::tauri::wry::android_binding!($domain, $package, $wry);
+    ::tauri::wry::android_binding!($domain, $app_name, $wry);
 
     ::tauri::tao::android_binding!(
       $domain,
-      $package,
+      $app_name,
       WryActivity,
       android_setup,
       $main,

examples/api/src-tauri/Cargo.lock

@@ -39,7 +39,7 @@ name = "cargo-tauri"
 path = "src/main.rs"
 
 [dependencies]
-cargo-mobile2 = { version = "0.11", default-features = false }
+cargo-mobile2 = { version = "0.12", default-features = false }
 jsonrpsee = { version = "0.22", features = [ "server" ] }
 jsonrpsee-core = "0.22"
 jsonrpsee-client-transport = { version = "0.22", features = [ "ws" ] }

tooling/cli/Cargo.lock

@@ -133,17 +133,13 @@ pub fn get_config(
     ..Default::default()
   };
 
-  set_var(
-    "WRY_ANDROID_PACKAGE",
-    format!("{}.{}", app.reverse_domain(), app.name_snake()),
-  );
+  set_var("WRY_ANDROID_PACKAGE", app.reverse_identifier());
   set_var("WRY_ANDROID_LIBRARY", app.lib_name());
   set_var("TAURI_ANDROID_PROJECT_PATH", config.project_dir());
 
   let src_main_dir = config.project_dir().join("app/src/main").join(format!(
-    "java/{}/{}",
-    app.reverse_domain().replace('.', "/"),
-    app.name_snake()
+    "java/{}",
+    app.reverse_identifier().replace('.', "/"),
   ));
   if config.project_dir().exists() {
     if src_main_dir.exists() {

tooling/cli/Cargo.toml

@@ -109,8 +109,8 @@ pub fn gen(
   );
   map.insert("windows", cfg!(windows));
 
-  let domain = config.app().reverse_domain().replace('.', "/");
-  let package_path = format!("java/{}/{}", domain, config.app().name_snake());
+  let identifier = config.app().reverse_identifier().replace('.', "/");
+  let package_path = format!("java/{}", identifier);
 
   map.insert("package-path", &package_path);
 

tooling/cli/src/mobile/android/mod.rs

@@ -288,24 +288,21 @@ fn read_options(identifier: &str) -> CliOptions {
 }
 
 pub fn get_app(config: &TauriConfig, interface: &AppInterface) -> App {
-  let mut s = config.identifier.rsplit('.');
-  let app_name = s.next().unwrap_or("app").to_string();
-  let mut domain = String::new();
-  for w in s {
-    domain.push_str(w);
-    domain.push('.');
-  }
-  if domain.is_empty() {
-    domain.clone_from(&config.identifier);
-    if domain.is_empty() {
-      log::error!("Bundle identifier set in `tauri.conf.json > identifier` cannot be empty");
-      exit(1);
-    }
-  } else {
-    domain.pop();
+  let identifier = config
+    .identifier
+    .rsplit('.')
+    .collect::<Vec<&str>>()
+    .join(".");
+
+  if identifier.is_empty() {
+    log::error!("Bundle identifier set in `tauri.conf.json > identifier` cannot be empty");
+    exit(1);
   }
 
-  let app_name = interface.app_settings().app_name().unwrap_or(app_name);
+  let app_name = interface
+    .app_settings()
+    .app_name()
+    .unwrap_or_else(|| "app".into());
   let lib_name = interface
     .app_settings()
     .lib_name()
@@ -315,7 +312,7 @@ pub fn get_app(config: &TauriConfig, interface: &AppInterface) -> App {
     name: app_name,
     lib_name: Some(lib_name),
     stylized_name: config.product_name.clone(),
-    domain,
+    identifier,
     asset_dir: None,
     template_pack: None,
   };