diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..13566b81b018ad684f3a35fee301741b2734c8f4 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/bevy-builder.iml b/.idea/bevy-builder.iml new file mode 100644 index 0000000000000000000000000000000000000000..d6ebd4805981b8400db3e3291c74a743fef9a824 --- /dev/null +++ b/.idea/bevy-builder.iml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..e0844bc7be0a8ca77dcee74dfc4059ee4a9d4a1d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/out" /> + </component> +</project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..3eb5c68ce000edf2353ac8a1ca0289e8faee4a6b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/bevy-builder.iml" filepath="$PROJECT_DIR$/.idea/bevy-builder.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/arm64.dockerfile b/arm64.dockerfile index f356d47056db1994f9a5c537828321b5a65f01d6..21af18374eada29e2c7465c0e2afb823500f11d8 100644 --- a/arm64.dockerfile +++ b/arm64.dockerfile @@ -1,7 +1,7 @@ ## This file can be used to build arm64 Linux versions of a Bevy project FROM r.lcr.gr/microhacks/msdfgen-builder:arm64 AS msdfgen -FROM rust:1.78.0-slim +FROM rust:1.80.0-slim COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen @@ -27,6 +27,7 @@ RUN apt-get update -yqq && \ librsvg2-dev \ git \ git-lfs \ + jq \ zip RUN wget https://lab.lcr.gr/microhacks/crunch/-/jobs/artifacts/trunk/raw/target/release/crunch?job=build-arm64 && \ diff --git a/x86.dockerfile b/x86.dockerfile index cb6b0759f52dd9619c69a3a7818da8b2413c7f2a..0e6166a54faf3d66436ab6881c7eb58b50024bda 100644 --- a/x86.dockerfile +++ b/x86.dockerfile @@ -1,10 +1,10 @@ ## This file can be used to build x86 Linux, x86 Windows and Wasm versions of a Bevy project FROM r.lcr.gr/microhacks/msdfgen-builder:latest AS msdfgen -FROM rust:1.78.0-slim AS trunkbuild +FROM rust:1.80-slim AS trunkbuild RUN cargo install --locked trunk && \ rm -rf ~/.cargo/registry/{cache,src} -FROM rust:1.78.0-slim +FROM rust:1.80.0-slim COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen @@ -32,6 +32,7 @@ RUN apt-get update -yqq && \ git \ git-lfs \ zip \ + jq \ g++-mingw-w64-x86-64 RUN rustup target add x86_64-pc-windows-gnu