Update to use Anki 2.1.54's code

.cargo/config.toml

@@ -0,0 +1,4 @@
+[env]
+RSLIB_FTL_ROOT = { value = "ftl/core/l10n.toml", relative = true }
+BUILDINFO = { value = "rslib-bridge/buildinfo.txt", relative = true }
+BAZEL = "1"

.github/workflows/linux_build.yml

@@ -15,60 +15,64 @@ jobs:
     timeout-minutes: 80
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Fetch submodules
-      run:  git submodule update --init --recursive --remote --force
+      - name: Fetch submodules
+        run: git submodule update --init --recursive
 
-    - name: Configure JDK 1.11
-      uses: actions/setup-java@v3
-      with:
-        distribution: "adopt"
-        java-version: "11" # minimum for Android API31
+      - name: Configure JDK 1.11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "adopt"
+          java-version: "11" # minimum for Android API31
 
-    - name: Install Android Command Line Tools
-      uses: android-actions/setup-android@v2
+      - name: Install Android Command Line Tools
+        uses: android-actions/setup-android@v2
 
-    # COULD_BE_BETTER: Consider turning this into a GitHub action - help the wider community
-    # NDK install (unzipping) is really noisy - silence the log spam with grep, while keeping errors
-    - name: Install NDK (silent)
-      run: .github/scripts/install_ndk.sh 22.0.7026061
+      # COULD_BE_BETTER: Consider turning this into a GitHub action - help the wider community
+      # NDK install (unzipping) is really noisy - silence the log spam with grep, while keeping errors
+      - name: Install NDK (silent)
+        run: .github/scripts/install_ndk.sh 22.0.7026061
 
-    - name: Install linker
-      run: .github/scripts/linux_install_x86_64-unknown-linux-gnu-gcc.sh
+      - name: Install linker
+        run: .github/scripts/linux_install_x86_64-unknown-linux-gnu-gcc.sh
 
-    # install cargo
-    - name: Install Rust
-      uses: actions-rs/[email protected]
-      with:
-        toolchain: 1.54.0
-        override: true
-        components: rustfmt
+      # install cargo
+      - name: Install Rust
+        uses: actions-rs/[email protected]
+        with:
+          toolchain: 1.58.1
+          override: true
+          components: rustfmt
 
-    # actions-rs only accepts "target" (although a "targets" param to be added in v2). We need 7 targets.
-    - name: Install Rust Targets
-      run: .github/scripts/install_rust_targets.sh
+      # actions-rs only accepts "target" (although a "targets" param to be added in v2). We need 7 targets.
+      - name: Install Rust Targets
+        run: .github/scripts/install_rust_targets.sh
 
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Rust Cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          rslib-bridge/target
-        key: ${{ runner.os }}-rust-v1-assembleRelease-${{ hashFiles('rslib-bridge/**/Cargo.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-rust-v1-assembleRelease
-          ${{ runner.os }}-rust-v1
+      - name: Install Python libs
+        run: |
+          pip3 install --upgrade protobuf stringcase
 
-    - name: Build
-      run: ./gradlew clean assembleRelease -DtestBuildType=release -Dorg.gradle.daemon=false -Dorg.gradle.console=plain # assembleAndroidTest
+      - name: Rust Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            rslib-bridge/target
+          key: ${{ runner.os }}-rust-v1-assembleRelease-${{ hashFiles('rslib-bridge/**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-v1-assembleRelease
+            ${{ runner.os }}-rust-v1
 
-    # Our publish workflow (publish_library.yaml) is on Ubuntu and needs javadocs (#57)
-    - name: Test Javadoc
-      run: ./gradlew :rsdroid:androidJavadocs -DtestBuildType=release -Dorg.gradle.daemon=false -Dorg.gradle.console=plain
+      - name: Build
+        run: ./gradlew clean assembleRelease -DtestBuildType=release -Dorg.gradle.daemon=false -Dorg.gradle.console=plain # assembleAndroidTest
+
+      # Our publish workflow (publish_library.yaml) is on Ubuntu and needs javadocs (#57)
+      - name: Test Javadoc
+        run: ./gradlew :rsdroid:androidJavadocs -DtestBuildType=release -Dorg.gradle.daemon=false -Dorg.gradle.console=plain

.github/workflows/macos_build.yml

@@ -16,72 +16,71 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 80
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Fetch submodules
-      run:  git submodule update --init --recursive --remote --force
-
-    - name: Configure JDK 1.11
-      uses: actions/setup-java@v3
-      with:
-        distribution: "adopt"
-        java-version: "11" # minimum for Android API31
-
-    - name: Install Android Command Line Tools
-      uses: android-actions/setup-android@v2
-
-    - name: Install NDK
-      run: .github/scripts/install_ndk.sh 22.0.7026061
-
-    - name: Test NDK
-      run: echo "NDK set to $ANDROID_NDK_HOME"
-
-    - name: Install Rust
-      uses: actions-rs/[email protected]
-      with:
-        toolchain: 1.54.0
-        override: true
-        components: rustfmt
-
-    # actions-rs only accepts "target" (although a "targets" param to be added in v2). We need 7 targets.
-    - name: Install Rust Targets
-      run: .github/scripts/install_rust_targets.sh
-
-    - name: Install Protoc
-      uses: arduino/setup-protoc@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Install & Test Protobuf Compiler
-      run: |
-              pip3 install protobuf
-              python3 .github/scripts/protoc_gen_deps.py
-
-    - name: Rust Cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          rslib-bridge/target
-        key: ${{ runner.os }}-rust-v1-assembleDebug-${{ hashFiles('rslib-bridge/**/Cargo.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-rust-v1-assembleDebug
-          ${{ runner.os }}-rust-v1
-
-    - name: Build
-      run: ./gradlew clean assembleDebug -DtestBuildType=debug -Dorg.gradle.daemon=false -Dorg.gradle.console=plain
-
-    - name: Build Instrumented Test APKs
-      run: ./gradlew rsdroid-instrumented:assembleDebug rsdroid-instrumented:assembleAndroidTest -DtestBuildType=debug -Dorg.gradle.daemon=false -Dorg.gradle.console=plain
-
-    - name: Upload APKs as Artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: rsdroid-instrumented
-        if-no-files-found: error
-        path: rsdroid-instrumented/build/outputs/apk
-
+      - uses: actions/checkout@v2
+
+      - name: Fetch submodules
+        run: git submodule update --init --recursive
+
+      - name: Configure JDK 1.11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "adopt"
+          java-version: "11" # minimum for Android API31
+
+      - name: Install Android Command Line Tools
+        uses: android-actions/setup-android@v2
+
+      - name: Install NDK
+        run: .github/scripts/install_ndk.sh 22.0.7026061
+
+      - name: Test NDK
+        run: echo "NDK set to $ANDROID_NDK_HOME"
+
+      - name: Install Rust
+        uses: actions-rs/[email protected]
+        with:
+          toolchain: 1.58.1
+          override: true
+          components: rustfmt
+
+      # actions-rs only accepts "target" (although a "targets" param to be added in v2). We need 7 targets.
+      - name: Install Rust Targets
+        run: .github/scripts/install_rust_targets.sh
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install & Test Protobuf Compiler
+        run: |
+          pip3 install --upgrade protobuf stringcase
+          python3 .github/scripts/protoc_gen_deps.py
+
+      - name: Rust Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            rslib-bridge/target
+          key: ${{ runner.os }}-rust-v1-assembleDebug-${{ hashFiles('rslib-bridge/**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-v1-assembleDebug
+            ${{ runner.os }}-rust-v1
+
+      - name: Build
+        run: ./gradlew clean assembleDebug -DtestBuildType=debug -Dorg.gradle.daemon=false -Dorg.gradle.console=plain
+
+      - name: Build Instrumented Test APKs
+        run: ./gradlew rsdroid-instrumented:assembleDebug rsdroid-instrumented:assembleAndroidTest -DtestBuildType=debug -Dorg.gradle.daemon=false -Dorg.gradle.console=plain
+
+      - name: Upload APKs as Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: rsdroid-instrumented
+          if-no-files-found: error
+          path: rsdroid-instrumented/build/outputs/apk
 
   test:
     needs: build
@@ -93,37 +92,37 @@ jobs:
         api-level: [21]
         arch: [x86, x86_64] # arm and arm64 are not supported by reactivecircus/android-emulator-runner
     steps:
-    - uses: actions/checkout@v2
-      name: Checkout
-
-    # COULD_BE_BETTER: This may not be needed - tiny speed penalty
-    - name: Fetch submodules
-      run:  git submodule update --init --recursive --remote --force
-
-    - name: Download APKs
-      uses: actions/download-artifact@v2
-      with:
-        name: rsdroid-instrumented
-        path: rsdroid-instrumented/build/outputs/apk
-
-    - name: Configure JDK 1.11
-      uses: actions/setup-java@v3
-      with:
-        distribution: "adopt"
-        java-version: "11" # minimum for Android API31
-
-    - name: Install Android Command Line Tools
-      uses: android-actions/setup-android@v2
-
-    - name: Install NDK
-      run: .github/scripts/install_ndk.sh 22.0.7026061
-
-    - name: run tests
-      uses: reactivecircus/android-emulator-runner@v2
-      timeout-minutes: 30
-      with:
-        api-level: ${{ matrix.api-level }}
-        target: default
-        arch: ${{ matrix.arch }}
-        profile: Nexus 6
-        script: ./gradlew rsdroid-instrumented:connectedCheck -x rsdroid-instrumented:packageDebugAndroidTest -x rsdroid-instrumented:packageDebug
+      - uses: actions/checkout@v2
+        name: Checkout
+
+      # COULD_BE_BETTER: This may not be needed - tiny speed penalty
+      - name: Fetch submodules
+        run: git submodule update --init --recursive
+
+      - name: Download APKs
+        uses: actions/download-artifact@v2
+        with:
+          name: rsdroid-instrumented
+          path: rsdroid-instrumented/build/outputs/apk
+
+      - name: Configure JDK 1.11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "adopt"
+          java-version: "11" # minimum for Android API31
+
+      - name: Install Android Command Line Tools
+        uses: android-actions/setup-android@v2
+
+      - name: Install NDK
+        run: .github/scripts/install_ndk.sh 22.0.7026061
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        timeout-minutes: 30
+        with:
+          api-level: ${{ matrix.api-level }}
+          target: default
+          arch: ${{ matrix.arch }}
+          profile: Nexus 6
+          script: ./gradlew rsdroid-instrumented:connectedCheck -x rsdroid-instrumented:packageDebugAndroidTest -x rsdroid-instrumented:packageDebug