Skip to content

Commit 43e54cd

Browse files
committed
Merge 'origin/master' into stable-19.0 and bump to 19.0.0 RC2
because master doesn't contain any changes that should not be contained in 19.0.0, backport PRs will be dismissed and RC2 will have the state of current master
2 parents 082ba8d + e0837af commit 43e54cd

File tree

793 files changed

+5488
-14780
lines changed

Some content is hidden

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

793 files changed

+5488
-14780
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
44
ENV ANDROID_HOME=/usr/lib/android-sdk
55

66
RUN apt-get update -y
7-
RUN apt-get install -y unzip wget openjdk-11-jdk vim
7+
RUN apt-get install -y unzip wget openjdk-17-jdk vim
88

99
RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -O /tmp/commandlinetools.zip
1010
RUN cd /tmp && unzip commandlinetools.zip

.devcontainer/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
-->
55
# Instructions
66

7-
1. Start a DevContainer either on GitHub Codespaces or locally in VSCode
8-
2. Accept all licenses by running `yes | /usr/lib/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses`
9-
3. You can now build the app using `./gradlew clean build`
7+
1. Start a DevContainer either on GitHub Codespaces or locally in VSCode.
8+
2. Accept all licenses by running `yes | /usr/lib/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses`.
9+
3. You can now build the app using `./gradlew clean build`.

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
swap-size-gb: 10
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
42+
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
4343
with:
4444
languages: ${{ matrix.language }}
4545
- name: Set up JDK 17
@@ -53,4 +53,4 @@ jobs:
5353
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
5454
./gradlew assembleDebug
5555
- name: Perform CodeQL Analysis
56-
uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
56+
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9

.github/workflows/pr-feedback.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
id: scrape
2525
with:
2626
website: 'https://nextcloud.com/team/'
27-
- uses: marcelklehr/pr-feedback-action@601109aa729eb4c8d6d0ece7567b9d4901db4aef
27+
- uses: marcelklehr/pr-feedback-action@1883b38a033fb16f576875e0cf45f98b857655c4
2828
with:
2929
feedback-message: |
3030
Hello there,

.github/workflows/reuse.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# synced from @nextcloud/android-config
2+
3+
# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. <https://fsfe.org>
4+
#
5+
# SPDX-License-Identifier: CC0-1.0
6+
7+
name: REUSE Compliance Check
8+
9+
on: [push, pull_request]
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
16+
- name: REUSE Compliance Check
17+
uses: fsfe/reuse-action@a46482ca367aef4454a87620aa37c2be4b2f8106 # v3.0.0

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242

4343
# Upload the results to GitHub's code scanning dashboard.
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
45+
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
4646
with:
4747
sarif_file: results.sarif

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
distribution: "temurin"
2929
java-version: 17
3030
- name: Run unit tests with coverage
31-
uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
31+
uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61 # v3.2.0
3232
with:
3333
arguments: testGplayDebugUnit
3434
- name: Upload test artifacts

.idea/copyright/Nextcloud_Talk___Android_Client.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.reuse/dep5

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@ Upstream-Name: Nextcloud Talk - Android Client
33
Upstream-Contact: Nextcloud Android team <[email protected]>
44
Source: https://github.com/nextcloud/talk-android
55

6-
Files: app/src/main/res/values-*/strings.xml */.gitignore .idea/* scripts/analysis/findbugs-results.txt scripts/analysis/lint-results.txt app/src/test/resources/robolectric.properties app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker fastlane/metadata/* app/src/main/res/mipmap-*dpi/ic_launcher.png app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/*.json
6+
Files: app/src/main/res/values-*/strings.xml */.gitignore .idea/* app/src/test/resources/robolectric.properties app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker fastlane/metadata/* app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/*.json app/src/generic/fastlane/metadata/android/*/full_description.txt
77
Copyright: 2017-2024 Nextcloud GmbH and Nextcloud contributors
88
License: GPL-3.0-or-later
99

10+
Files: app/src/*/res/mipmap-*dpi/ic_launcher.png app/src/*/ic_launcher-web.png
11+
Copyright: 2017-2024 Nextcloud GmbH. All rights reserved. Trademarks apply, see https://nextcloud.com/trademarks/
12+
License: GPL-3.0-or-later
13+
1014
Files: app/src/main/res/raw/tr110_1_kap8_3_freiton1.ogg
1115
Copyright: 2007 arvedkrynil
1216
License: CC-BY-SA-3.0
17+
18+
Files: app/src/main/res/raw/librem_by_feandesign_call.ogg app/src/main/res/raw/librem_by_feandesign_message.ogg
19+
Copyright: Feandesign
20+
License: CC0-1.0

0 commit comments

Comments
 (0)