Skip to content

Commit e8689dd

Browse files
abdusalamAppsabdusalamApps
authored
Merge branch 'main' into 1441-signle-note-widget-card-radius-too-big
2 parents e7ee2b6 + 6b336e4 commit e8689dd

File tree

187 files changed

+4167
-1197
lines changed

Some content is hidden

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

187 files changed

+4167
-1197
lines changed

‎.bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_PATH: "vendor/bundle"

‎.github/FUNDING.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# These are supported funding model platforms
22

3-
liberapay: stefan-niedermann
4-
custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=K7HVLE6J7SXXA
3+
custom: https://nextcloud.com/include/

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ labels: bug
88
Guidelines for submitting issues:
99
1010
* Bug reports which do not fill the complete issue template will be closed.
11-
* Please have a look at our [FAQ](https://github.com/stefan-niedermann/nextcloud-notes/blob/master/FAQ.md)
11+
* Please have a look at our [FAQ](https://github.com/nextcloud/notes-android/blob/main/FAQ.md)
1212
* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
1313
* This repository is *only* for issues within the Nextcloud Notes Android app
1414
-->

‎.github/dependabot.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
# synced from @nextcloud/android-config
12
version: 2
23
updates:
3-
- package-ecosystem: gradle
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 10
8-
- package-ecosystem: github-actions
9-
directory: "/"
10-
schedule:
11-
interval: daily
12-
open-pull-requests-limit: 10
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
8+
- package-ecosystem: gradle
9+
directory: "/"
10+
schedule:
11+
interval: daily
12+
time: "03:00"
13+
timezone: Europe/Paris
14+
rebase-strategy: "disabled"
15+
open-pull-requests-limit: 10
16+
labels:
17+
- 3. to review
18+
- dependencies

‎.github/workflows/android.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Android CI
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
push:
6+
branches: [ main, stable-* ]
47

58
permissions:
69
contents: read

‎.github/workflows/autoApproveDependabot.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# synced from @nextcloud/android-config
2+
name: Auto approve dependabot
3+
4+
on:
5+
pull_request_target:
6+
branches:
7+
- main
8+
- master
9+
- stable-*
10+
11+
permissions:
12+
contents: read
13+
14+
concurrency:
15+
group: dependabot-approve-${{ github.head_ref || github.run_id }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
auto-approve:
20+
name: Auto approve dependabot
21+
runs-on: ubuntu-latest
22+
if: github.actor == 'dependabot[bot]'
23+
permissions:
24+
# needed to approve the PR
25+
pull-requests: write
26+
27+
steps:
28+
- uses: hmarr/auto-approve-action@44888193675f29a83e04faf4002fa8c0b537b1e4 # v3.2.1
29+
with:
30+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/autoApproveSync.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# synced from @nextcloud/android-config
2+
name: Auto approve sync
3+
on:
4+
pull_request_target:
5+
branches:
6+
- master
7+
- main
8+
types:
9+
- opened
10+
- reopened
11+
- synchronize
12+
- labeled
13+
14+
concurrency:
15+
group: sync-approve-${{ github.head_ref || github.run_id }}
16+
cancel-in-progress: true
17+
18+
permissions:
19+
pull-requests: write
20+
21+
jobs:
22+
auto-approve:
23+
name: Auto approve sync
24+
runs-on: ubuntu-latest
25+
if: ${{ contains(github.event.pull_request.labels.*.name, 'sync') && github.actor == 'nextcloud-android-bot' }}
26+
steps:
27+
- uses: hmarr/auto-approve-action@44888193675f29a83e04faf4002fa8c0b537b1e4 # v3.2.1
28+
with:
29+
github-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/codeql.yml

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,49 @@
1-
name: CodeQL security scan
1+
# synced from @nextcloud/android-config
2+
name: "CodeQL"
23

34
on:
5+
push:
6+
branches: [ "master", "main", "stable-*" ]
47
pull_request:
8+
branches: [ "master", "main" ]
59
schedule:
6-
- cron: '0 12 * * *'
10+
- cron: '24 18 * * 3'
711

812
permissions:
913
contents: read
10-
security-events: write
11-
pull-requests: read
1214

1315
jobs:
14-
codeql:
15-
name: CodeQL security scan
16+
analyze:
17+
name: Analyze
1618
runs-on: ubuntu-latest
19+
permissions:
20+
actions: read
21+
contents: read
22+
security-events: write
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
language: [ 'java' ]
1727
steps:
18-
- name: Checkout
19-
uses: actions/checkout@v3
28+
- name: Checkout repository
29+
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
30+
- name: Set Swap Space
31+
uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0
32+
with:
33+
swap-size-gb: 10
2034
- name: Initialize CodeQL
21-
uses: github/codeql-action/init@v2
35+
uses: github/codeql-action/init@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9
36+
with:
37+
languages: ${{ matrix.language }}
38+
- name: Set up JDK
39+
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
2240
with:
23-
languages: java
24-
- name: Build debug APK
25-
run: bash ./gradlew assembleDev --stacktrace
41+
distribution: "temurin"
42+
java-version: 11
43+
- name: Assemble
44+
run: |
45+
mkdir -p "$HOME/.gradle"
46+
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
47+
./gradlew assembleDebug
2648
- name: Perform CodeQL Analysis
27-
uses: github/codeql-action/analyze@v2
49+
uses: github/codeql-action/analyze@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9

‎.github/workflows/command-rebase.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# This workflow is provided via the organization template repository
2+
#
3+
# https://github.com/nextcloud/.github
4+
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
6+
name: Rebase command
7+
8+
on:
9+
issue_comment:
10+
types: created
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
rebase:
17+
runs-on: ubuntu-latest
18+
permissions:
19+
contents: none
20+
21+
# On pull requests and if the comment starts with `/rebase`
22+
if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
23+
24+
steps:
25+
- name: Add reaction on start
26+
uses: peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d # v2.1.1
27+
with:
28+
token: ${{ secrets.COMMAND_BOT_PAT }}
29+
repository: ${{ github.event.repository.full_name }}
30+
comment-id: ${{ github.event.comment.id }}
31+
reaction-type: "+1"
32+
33+
- name: Checkout the latest code
34+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
35+
with:
36+
fetch-depth: 0
37+
token: ${{ secrets.COMMAND_BOT_PAT }}
38+
39+
- name: Automatic Rebase
40+
uses: cirrus-actions/rebase@b87d48154a87a85666003575337e27b8cd65f691 # 1.8
41+
env:
42+
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
43+
44+
- name: Add reaction on failure
45+
uses: peter-evans/create-or-update-comment@67dcc547d311b736a8e6c5c236542148a47adc3d # v2.1.1
46+
if: failure()
47+
with:
48+
token: ${{ secrets.COMMAND_BOT_PAT }}
49+
repository: ${{ github.event.repository.full_name }}
50+
comment-id: ${{ github.event.comment.id }}
51+
reaction-type: "-1"

‎.github/workflows/detectNewJavaFiles.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# synced from @nextcloud/android-config
2+
name: "Detect new java files"
3+
4+
on:
5+
pull_request:
6+
branches: [ master, main, stable-* ]
7+
8+
permissions: read-all
9+
10+
jobs:
11+
detectNewJavaFiles:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- id: file_changes
15+
uses: trilom/file-changes-action@a6ca26c14274c33b15e6499323aac178af06ad4b # v1.2.4
16+
with:
17+
output: ','
18+
- name: Detect new java files
19+
run: |
20+
if [ -z '${{ steps.file_changes.outputs.files_added }}' ]; then
21+
echo "No new files added"
22+
exit 0
23+
fi
24+
new_java=$(echo '${{ steps.file_changes.outputs.files_added }}' | tr ',' '\n' | grep '\.java$' | cat)
25+
if [ -n "$new_java" ]; then
26+
# shellcheck disable=SC2016
27+
printf 'New java files detected:\n```\n%s\n```\n' "$new_java" | tee "$GITHUB_STEP_SUMMARY"
28+
exit 1
29+
else
30+
echo "No new java files detected"
31+
exit 0
32+
fi

0 commit comments

Comments
 (0)