Merge pull request #874 from AmbientRun/fix-api-version

Fix new package api version. Fixes #873
AmbientRun · Sep 15, 2023 · a20eb5b · a20eb5b
2 parents b43d252 + 3472d15
commit a20eb5b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/app/src/cli/new_package.rs b/app/src/cli/new_package.rs
@@ -48,7 +48,11 @@ pub(crate) fn handle(
     // Write the files to disk.
     let ambient_toml = include_str!("new_package_template/ambient.toml")
         .replace("{{id}}", id.as_str())
-        .replace("{{name}}", name);
+        .replace("{{name}}", name)
+        .replace(
+            "{{ambient_version}}",
+            &format!("{}", ambient_native_std::ambient_version().version),
+        );
 
     let cargo_toml = {
         // Special-case creating an example in guest/rust/examples so that it "Just Works".
@@ -70,23 +74,18 @@ pub(crate) fn handle(
             None => {
                 let version = ambient_version();
                 (
-                    #[cfg(feature = "production")]
-                    format!("ambient_api = \"{}\"", version.version),
-                    #[cfg(not(feature = "production"))]
-                    {
-                        if let Some(api_path) = api_path {
-                            log::info!("Ambient path: {}", api_path);
-                            format!("ambient_api = {{ path = {:?} }}", api_path)
-                        } else if let Some(tag) = version.tag() {
-                            log::info!("Ambient tag: {}", tag);
-                            format!("ambient_api = {{ git = \"https://github.com/AmbientRun/Ambient.git\", tag = \"{}\" }}", tag)
-                        } else if !version.revision.is_empty() {
-                            log::info!("Ambient revision: {}", version.revision);
-                            format!("ambient_api = {{ git = \"https://github.com/AmbientRun/Ambient.git\", rev = \"{}\" }}", version.revision)
-                        } else {
-                            log::info!("Ambient version: {}", version.version);
-                            format!("ambient_api = \"{}\"", version.version)
-                        }
+                    if let Some(api_path) = api_path {
+                        log::info!("Ambient path: {}", api_path);
+                        format!("ambient_api = {{ path = {:?} }}", api_path)
+                    } else if let Some(tag) = version.tag() {
+                        log::info!("Ambient tag: {}", tag);
+                        format!("ambient_api = {{ git = \"https://github.com/AmbientRun/Ambient.git\", tag = \"{}\" }}", tag)
+                    } else if !version.revision.is_empty() {
+                        log::info!("Ambient revision: {}", version.revision);
+                        format!("ambient_api = {{ git = \"https://github.com/AmbientRun/Ambient.git\", rev = \"{}\" }}", version.revision)
+                    } else {
+                        log::info!("Ambient version: {}", version.version);
+                        format!("ambient_api = \"{}\"", version.version)
                     },
                     false,
                 )

diff --git a/app/src/cli/new_package_template/ambient.toml b/app/src/cli/new_package_template/ambient.toml
@@ -3,3 +3,4 @@ id = "{{id}}"
 name = "{{name}}"
 version = "0.0.1"
 content = { type = "Playable" }
+ambient_version = "{{ambient_version}}"