Flatten directory structure

Convert the cargo workspace from virtual manifest to explicit by making
dungeoncrawl as the main module

Author: rax35

.github/workflows/build.yml

@@ -37,21 +37,20 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           target: "wasm32-unknown-unknown, aarch64-linux-android, armv7-linux-androideabi, i686-linux-android, x86_64-linux-android"
-          cache-workspaces: "./rustlib/rust_workspace"
+          cache-workspaces: "."
           rustflags: ""
 
       - name: Install cargo-ndk
         run: cargo install cargo-ndk
 
       - name: Build WASM
-        working-directory: ./rustlib/rust_workspace
         run: ./wasm_build.sh --profile web-release
 
       - name: Upload WASM Artifacts
         uses: actions/upload-pages-artifact@v3
         with:
           # Upload dist folder
-          path: './rustlib/rust_workspace/dist'
+          path: './dist'
 
       - name: NDK cache
         id: cache-ndk

.gitignore

@@ -111,7 +111,7 @@ google-services.json
 
 # Generated by Cargo
 # will have compiled files and executables
-rustlib/rust_workspace/target/
+target/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

rustlib/rust_workspace/Cargo.lock Cargo.lockrustlib/rust_workspace/Cargo.lock renamed to Cargo.lock

@@ -9,7 +9,7 @@ crate-type = ["lib", "cdylib"]
 
 [dependencies]
 fastrand = "2.3.0"
-input_lib = { version = "0.1.0", path = "../input_lib" }
+input_lib = { version = "0.1.0", path = "input_lib" }
 macroquad = { version = "=0.4.13", features = ["backtrace"] }
 getrandom = { version = "*", features = ["js"] }
 bevy_ecs = { version = "0.16.0", features = ["configurable_error_handler"] }
@@ -23,19 +23,23 @@ fnv = "1.0.7"
 serde = { version = "1.0.219", features = ["derive"] }
 ron = "0.10.1"
 
-# [package.metadata.android]
-# build_targets = [ "aarch64-linux-android" ]
-# package_name = "dev.spectorstudios.dungeoncrawl"
-# label = "Dungeon Crawl"
-# assets = "assets"
-# res = "android_res"
-# icon = "@mipmap/ic_launcher"
-# version_code = 2
-# version_name = "0.0.2"
+[workspace]
+resolver = "3"
+members = [ "macroquad_ex_ui", "input_lib"]
 
-# [package.metadata.android.application_attributes]
-# "android:hardwareAccelerated" = "true"
-# "android:appCategory" = "game"
+[profile.dev]
+opt-level = 0
 
-# [package.metadata.android.activity_attributes]
-# "android:exported" = "true"
+[profile.dev.package."*"]
+opt-level = 1
+
+[profile.release]
+strip = "debuginfo"
+codegen-units = 1
+lto = "thin"
+
+[profile.web-release]
+inherits = "release"
+opt-level = "s"
+strip = true
+panic = 'unwind'

…b/rust_workspace/dungeoncrawl/Cargo.toml Cargo.tomlrustlib/rust_workspace/dungeoncrawl/Cargo.toml renamed to Cargo.toml rustlib/rust_workspace/dungeoncrawl/Cargo.toml renamed to Cargo.toml

@@ -47,7 +47,7 @@ android {
             }
 
             if (storePath != null && storePassword != null && keyAlias != null && keyPassword != null) {
-                println("✅ Using custom debug signing config")
+                println("✅ Using custom signing config")
                 storeFile = file(storePath)
                 this.storePassword = storePassword
                 this.keyAlias = keyAlias
@@ -78,13 +78,13 @@ android {
 
     sourceSets {
         getByName("main") {
-            assets.srcDirs(project(":rustlib").layout.buildDirectory.dir("assets").get().asFile)
+            assets.srcDirs(project(":rust-android-build").layout.buildDirectory.dir("assets").get().asFile)
         }
         getByName("debug") {
-            jniLibs.srcDirs(project(":rustlib").layout.buildDirectory.dir("debug/jniLibs").get().asFile)
+            jniLibs.srcDirs(project(":rust-android-build").layout.buildDirectory.dir("debug/jniLibs").get().asFile)
         }
         getByName("release") {
-            jniLibs.srcDirs(project(":rustlib").layout.buildDirectory.dir("release/jniLibs").get().asFile)
+            jniLibs.srcDirs(project(":rust-android-build").layout.buildDirectory.dir("release/jniLibs").get().asFile)
         }
     }
 }
@@ -99,16 +99,16 @@ afterEvaluate {
         "explodeAssetSourceRelease"
     ).forEach {taskName ->
         tasks.named(taskName).configure {
-            dependsOn(":rustlib:copyAssets")
+            dependsOn(":rust-android-build:copyAssets")
         }
     }
 
     tasks.named("mergeDebugJniLibFolders").configure {
-        dependsOn(":rustlib:buildRustLibsDebug")
+        dependsOn(":rust-android-build:buildRustLibsDebug")
     }
 
     tasks.named("mergeReleaseJniLibFolders").configure {
-        dependsOn(":rustlib:buildRustLibsRelease")
+        dependsOn(":rust-android-build:buildRustLibsRelease")
     }
 }