Skip to content

Commit 0f9e107

Browse files
Merge branch 'master' into use-sha256
2 parents ab1d316 + 882bc10 commit 0f9e107

70 files changed

Lines changed: 5121 additions & 417 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.drone.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ services:
113113
- su www-data -c "php /var/www/html/occ app:enable -f files_downloadlimit"
114114
- su www-data -c "git clone --depth 1 -b master https://github.com/nextcloud/recommendations.git /var/www/html/apps/recommendations/"
115115
- su www-data -c "php /var/www/html/occ app:enable -f recommendations"
116+
- su www-data -c "php /var/www/html/occ config:system:set ratelimit.protection.enabled --value false --type bool"
116117
- /usr/local/bin/run.sh
117118

118119
trigger:
@@ -232,6 +233,7 @@ services:
232233
- su www-data -c "php /var/www/html/occ app:enable -f files_downloadlimit"
233234
- su www-data -c "git clone --depth 1 -b $SERVER_VERSION https://github.com/nextcloud/recommendations.git /var/www/html/apps/recommendations/"
234235
- su www-data -c "php /var/www/html/occ app:enable recommendations"
236+
- su www-data -c "php /var/www/html/occ config:system:set ratelimit.protection.enabled --value false --type bool"
235237
- /usr/local/bin/run.sh
236238

237239
trigger:
@@ -243,6 +245,6 @@ trigger:
243245
- pull_request
244246
---
245247
kind: signature
246-
hmac: f9e2219ba5004d6abb6eb04ede0dedf0b9d5f20d8769228c1e48a09451a54b06
248+
hmac: 4d9e2296a2418db6dae22e94c282a4b356788d99c268d722721dddddd35f43b3
247249

248250
...

.github/workflows/analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Disabled on forks
32-
if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
32+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}
3333
run: |
3434
echo 'Can not analyze PRs from forks'
3535
exit 1
@@ -57,7 +57,7 @@ jobs:
5757
repository: ${{ steps.get-vars.outputs.repo }}
5858
ref: ${{ steps.get-vars.outputs.branch }}
5959
- name: Set up JDK 17
60-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
60+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6161
with:
6262
distribution: "temurin"
6363
java-version: 17

.github/workflows/assemble.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,25 @@ on:
1212
push:
1313
branches: [ master, stable-* ]
1414

15+
permissions:
16+
contents: read
17+
1518
jobs:
1619
assemble:
1720
runs-on: ubuntu-latest
1821
steps:
1922
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2023
- name: Set up JDK 17
21-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
24+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2225
with:
2326
distribution: "temurin"
2427
java-version: 17
25-
- uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
28+
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
2629
- name: Setup JVM options
2730
run: |
2831
mkdir -p "$HOME/.gradle"
2932
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
3033
- name: Setup Gradle
31-
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
34+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
3235
- name: Assemble
3336
run: ./gradlew assemble

.github/workflows/check.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
push:
1010
branches: [ master, stable-* ]
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
check:
1417
runs-on: ubuntu-latest
@@ -19,7 +22,7 @@ jobs:
1922
steps:
2023
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2124
- name: Set up JDK 17
22-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2326
with:
2427
distribution: "temurin"
2528
java-version: 17

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
with:
4444
swap-size-gb: 10
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
46+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
4747
with:
4848
languages: ${{ matrix.language }}
4949
- name: Set up JDK 17
50-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
50+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
5151
with:
5252
distribution: "temurin"
5353
java-version: 17
@@ -57,4 +57,4 @@ jobs:
5757
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
5858
./gradlew assembleDebug
5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
60+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5

.github/workflows/pr-feedback.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -)
3737
echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT"
3838
39-
- uses: nextcloud/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4 # main
39+
- uses: nextcloud/pr-feedback-action@e397f3c7e655092b746e3610d121545530c6a90e # main
4040
with:
4141
feedback-message: |
4242
Hello there,

.github/workflows/renovate-approve-merge.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
permissions:
3030
# for hmarr/auto-approve-action to approve PRs
3131
pull-requests: write
32-
# for alexwilson/enable-github-automerge-action to approve PRs
33-
contents: write
3432

3533
steps:
3634
- name: Disabled on forks
@@ -46,13 +44,18 @@ jobs:
4644

4745
# GitHub actions bot approve
4846
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
49-
if: startsWith(steps.branchname.outputs.branch, 'renovate/')
47+
if: github.actor == 'renovate[bot]'
5048
with:
5149
github-token: ${{ secrets.GITHUB_TOKEN }}
5250

53-
# Enable GitHub auto merge
54-
- name: Auto merge
55-
uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
56-
if: startsWith(steps.branchname.outputs.branch, 'renovate/')
51+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5752
with:
58-
github-token: ${{ secrets.GITHUB_TOKEN }}
53+
ref: ${{ github.head_ref }}
54+
55+
# Enable GitHub auto merge
56+
- name: Enable Pull Request Automerge
57+
if: github.actor == 'renovate[bot]'
58+
run: gh pr merge --merge --auto
59+
env:
60+
GH_TOKEN: ${{ secrets.AUTOMERGE }}
61+

.github/workflows/reuse.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ name: REUSE Compliance Check
1111

1212
on: [pull_request]
1313

14+
permissions:
15+
contents: read
16+
1417
jobs:
1518
reuse-compliance-check:
16-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-latest-low
1720
steps:
1821
- name: Checkout
1922
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: "Run analysis"
37-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
37+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
4141
publish_results: false
4242

4343
# Upload the results to GitHub's code scanning dashboard.
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
45+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
4646
with:
4747
sarif_file: results.sarif

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Licensed under Apache License, Version 2.0.
116116

117117
## Compatibility
118118

119-
Nextcloud Android library is valid for Android version 3.0 and up (with ```android:minSdkVersion="11"``` and ```android:targetSdkVersion="24"```).
119+
Nextcloud Android library is valid for Android version 5.0 and up (with ```android:minSdkVersion="21"``` and ```android:targetSdkVersion="35"```).
120120

121121
Nextcloud Android library supports Nextcloud server from version 9+.
122122

0 commit comments

Comments
 (0)