Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 39e705e4 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #2056 from nextcloud/repo-sync/android-config/main 

🔄 synced file(s) with nextcloud/android-config
parents 9744723f c2bbace1

.github/workflows/codeql.yml

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ jobs: 
        with:

          swap-size-gb: 10

      - name: Initialize CodeQL

        uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6

        uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7

        with:

          languages: ${{ matrix.language }}

      - name: Set up JDK 17
@@ -53,4 +53,4 @@ jobs: 
          echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"

          ./gradlew assembleDebug

      - name: Perform CodeQL Analysis

        uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
 
        uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7

.github/workflows/pr-feedback.yml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
# SPDX-FileCopyrightText: 2023 Joas Schilling <213943+nickvergessen@users.noreply.github.com>

# SPDX-FileCopyrightText: 2023 Daniel Kesselberg <mail@danielkesselberg.de>

# SPDX-FileCopyrightText: 2023 Florian Steffens <florian.steffens@nextcloud.com>

# SPDX-License-Identifier: AGPL-3.0-or-later

# SPDX-License-Identifier: MIT



name: 'Ask for feedback on PRs'

on:

.github/workflows/scorecard.yml

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,6 @@ jobs: 


      # Upload the results to GitHub's code scanning dashboard.

      - name: "Upload to code-scanning"

        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6

        uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7

        with:

          sarif_file: results.sarif

LICENSES/AGPL-3.0-or-later.txt

deleted100644 → 0
+0 −235

File deleted.

Preview size limit exceeded, changes collapsed.

LICENSES/MIT.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
MIT License



Copyright (c) <year> <copyright holders>



Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.