diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml index c930d44e95..8a09c8c6f8 100644 --- a/.github/workflows/buildAndDeploy.yml +++ b/.github/workflows/buildAndDeploy.yml @@ -20,7 +20,7 @@ jobs: release_body: ${{ steps.read_release.outputs.release_body }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Read release.md and use it as a body of new release. This will fail for patch releases, since they have no readme. continue-on-error: true @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-latest needs: get-release-body steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: @@ -107,7 +107,7 @@ jobs: runs-on: ubuntu-latest needs: get-release-body steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: @@ -178,7 +178,7 @@ jobs: runs-on: ubuntu-latest needs: build-jar steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index b550b3caf9..809219015a 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -14,7 +14,7 @@ jobs: name: Check code and run unit tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: diff --git a/.github/workflows/buildMultiplatform.yml b/.github/workflows/buildMultiplatform.yml index 4d097cecab..4f68faadd1 100644 --- a/.github/workflows/buildMultiplatform.yml +++ b/.github/workflows/buildMultiplatform.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest name: Build Android (Java ${{ matrix.java_version }}) steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: @@ -72,7 +72,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: diff --git a/.github/workflows/detektAnalysis.yml b/.github/workflows/detektAnalysis.yml index d614ac96f0..778f0b8a6d 100644 --- a/.github/workflows/detektAnalysis.yml +++ b/.github/workflows/detektAnalysis.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v2 diff --git a/.github/workflows/dockerPublish.yml b/.github/workflows/dockerPublish.yml index ccb17ea7a5..ebf5627a3c 100644 --- a/.github/workflows/dockerPublish.yml +++ b/.github/workflows/dockerPublish.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Install the cosign tool except on PR # https://github.com/sigstore/cosign-installer diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml index 61a48fa2db..210453e8d4 100644 --- a/.github/workflows/mkdocs.yml +++ b/.github/workflows/mkdocs.yml @@ -8,7 +8,7 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v2 with: python-version: 3.x diff --git a/.github/workflows/uncivbot.yml b/.github/workflows/uncivbot.yml index 707311612d..823d53807e 100644 --- a/.github/workflows/uncivbot.yml +++ b/.github/workflows/uncivbot.yml @@ -11,7 +11,7 @@ jobs: # This is the only place I could find an apparent list of valid author associations. Also, at least they're not case-sensitive: https://docs.github.com/en/graphql/reference/enums#commentauthorassociation https://docs.github.com/en/actions/learn-github-actions/expressions#contains runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v2 - name: Generate new buildConfig.kt and changelog.md files run: | @@ -53,7 +53,7 @@ jobs: repo: repository.repo, }) - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Required for triggering the deploy on tags added by this automation # See https://github.com/stefanzweifel/git-auto-commit-action#commits-made-by-this-action-do-not-trigger-new-workflow-runs token: ${{ secrets.ACTIONS_ACCESS_TOKEN }} @@ -76,7 +76,7 @@ jobs: # This is the only place I could find an apparent list of valid author associations. Also, at least they're not case-sensitive: https://docs.github.com/en/graphql/reference/enums#commentauthorassociation https://docs.github.com/en/actions/learn-github-actions/expressions#contains runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v2 - name: Add translation PRs to the new branch, and PR the new branch to master diff --git a/core/src/com/unciv/logic/BackwardCompatibility.kt b/core/src/com/unciv/logic/BackwardCompatibility.kt index 3662ffac54..da01d73ea1 100644 --- a/core/src/com/unciv/logic/BackwardCompatibility.kt +++ b/core/src/com/unciv/logic/BackwardCompatibility.kt @@ -201,7 +201,7 @@ object BackwardCompatibility { historyStartTurn = turns } - fun GameInfo.ensureUnitIds(){ + fun GameInfo.ensureUnitIds() { if (lastUnitId == 0) lastUnitId = tileMap.values.asSequence() .flatMap { it.getUnits() }.maxOfOrNull { it.id }?.coerceAtLeast(0) ?: 0 for (unit in tileMap.values.flatMap { it.getUnits() }) {