Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	Cargo.toml
#	crates/bevy_app/Cargo.toml

.cargo/config_fast_builds

@@ -10,7 +10,7 @@ rustflags = ["-Clink-arg=-fuse-ld=lld", "-Zshare-generics=y"]
 # NOTE: you must manually install https://github.com/michaeleisel/zld on mac. you can easily do this with the "brew" package manager:
 # `brew install michaeleisel/zld/zld`
 [target.x86_64-apple-darwin]
-rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld", "-Zshare-generics=y"]
+rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld", "-Zshare-generics=y", "-Zrun-dsymutil=no"]
 
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld.exe"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug Report
+about: Report a bug to help us improve!
+title: ''
+labels: ''
+assignees: ''
+---
+
+**Bevy version**
+
+The release number or commit hash of the version you're using.
+
+**Operating system & version**
+
+Ex: Windows 10, Ubuntu 18.04, iOS 14.
+
+**What you did**
+
+The steps you took to uncover this bug. Please list full reproduction steps if
+feasible.
+
+**What you expected to happen**
+
+What you think should've happened if everything was working properly.
+
+**What actually happened**
+
+The actual result of the actions you described.
+
+**Additional information**
+
+Any additional information you would like to add such as screenshots, logs, etc.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,24 @@
+---
+name: Feature Request
+about: Propose a new feature!
+title: ''
+labels: ''
+assignees: ''
+---
+
+**What problem does this solve or what need does it fill?**
+
+A description of why this particular feature should be added.
+
+**Describe the solution would you like?**
+
+The solution you propose for the problem presented.
+
+**Describe the alternative(s) you've considered?**
+
+Other solutions to solve and/or work around the problem presented.
+
+**Additional context**
+
+Any other information you would like to add such as related previous work,
+screenshots, benchmarks, etc.

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: weekly
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

.github/workflows/ci.yml

@@ -18,6 +18,8 @@ jobs:
         exclude:
           - os: macos-10.15
             toolchain: nightly
+          - os: windows-2019
+            toolchain: nightly
     runs-on: ${{ matrix.os }}
     needs: clean
     steps:
@@ -55,32 +57,66 @@ jobs:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-C debuginfo=0 -D warnings"
 
+  build-wasm:
+    strategy:
+      matrix:
+        toolchain: [stable, nightly]
+        os: [ubuntu-20.04]
+    runs-on: ${{ matrix.os }}
+    needs: clean
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          target: wasm32-unknown-unknown
+          override: true
+
+      - uses: actions/cache@v2
+        with:
+          path: |
+            target
+          key: ${{ runner.os }}-cargo-check-test-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Check wasm
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --target wasm32-unknown-unknown --no-default-features --features bevy_winit,x11,hdr,bevy_gltf
+
+  build-android:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Android targets
+      run: rustup target add aarch64-linux-android armv7-linux-androideabi
+    - name: Install Cargo APK
+      run: cargo install cargo-apk
+    - name: Build APK
+      run: cargo apk build --example android
+
   clean:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2020-12-07
           components: rustfmt, clippy
           override: true
-          
+
       - name: Install alsa
-        run: sudo apt-get install --no-install-recommends libasound2-dev
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev
 
       - name: Install udev
-        run: sudo apt-get install --no-install-recommends libudev-dev
+        run: sudo apt-get update; sudo apt-get install --no-install-recommends libudev-dev
 
       - name: Check the format
-        run: cargo +nightly fmt --all -- --check
+        run: cargo +nightly-2020-12-07 fmt --all -- --check
 
       # type complexity must be ignored because we use huge templates for queries
+      # -A clippy::manual-strip: strip_prefix support was added in 1.45. we want to support earlier rust versions
       - name: Run clippy
-        run: >
-          cargo +nightly clippy
-          --all-targets
-          --all-features
-          --
-          -D warnings
-          -A clippy::type_complexity
+        run: cargo clippy --all-targets --all-features -- -D warnings -A clippy::type_complexity -A clippy::manual-strip

.github/workflows/ios.yml

@@ -0,0 +1,36 @@
+name: iOS cron CI
+
+on:
+  schedule:
+    - cron:  '0 0 * * *'
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - uses: actions/cache@v2
+        with:
+          path: |
+            target
+          key: ${{ runner.os }}-cargo-check-test-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.lock') }}
+
+      - uses: actions-rs/[email protected]
+        with:
+          crate: cargo-lipo
+          version: latest
+
+      - name: Add iOS targets
+        run: rustup target add aarch64-apple-ios x86_64-apple-ios
+
+      - name: Build and install iOS app in iOS Simulator.
+        run: cd examples/ios && make install

.gitignore

@@ -3,6 +3,7 @@ crates/*/target
 **/*.rs.bk
 Cargo.lock
 .cargo/config
+.cargo/config.toml
 /.idea
 /.vscode
-/benches/target
+/benches/target