Skip to content

Commit 8300aae

Browse files
committed
Merge branch 'master' into release/4.8.3_
2 parents 79fcd3f + 515b8ad commit 8300aae

64 files changed

Lines changed: 348 additions & 633 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.

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# SPDX-FileCopyrightText: ownCloud GmbH - A Kiteworks Company and ownCloud contributors
2+
# SPDX-License-Identifier: Apache-2.0
3+
#
4+
# Managed by owncloud/admin — edit codeowners/ownership.yml, not this file.
5+
# Generated by scripts/sync-codeowners.py. Last matching pattern wins.
6+
* @owncloud/android-maintainers

‎.github/ISSUE_TEMPLATE/release_template.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ _____
6262

6363
### TASKS:
6464

65+
- [ ] [GIT] Merge translations branch `chore/translations-update` into `master`
66+
- [ ] [GIT] Merge calens branch `chore/changelog-update` into `master`
67+
- [ ] [GIT] Merge sbom branch `chore/sbom-update` into `master`
6568
- [ ] [GIT] Create branch `release/M.m.p` in owncloud/android from `latest`
6669
- [ ] [DEV] Update version number and name in build.gradle in owncloudApp module
6770
- [ ] [DIS] Update release notes in app and changelog in `unreleased` with the proper content for the release
@@ -78,10 +81,10 @@ _____
7881
- [ ] [DIS] Upload release APK and bundle to internal ownCloud instance
7982
- [ ] [DIS] Upload and publish release bundle and changelog in Play Store
8083
- [ ] [DIS] Update screenshots in Play Store/GitHub/F-Droid
84+
- [ ] [DIS] Release published in Play Store
8185
- [ ] [GIT] Create and sign tag `vM.m.p` in HEAD commit of release branch, in owncloud/android
8286
- [ ] [GIT] Move tag `latest` pointing the same commit as the release commit
8387
- [ ] [DIS] Publish a new [release](https://github.com/owncloud/android/releases) in owncloud/android
84-
- [ ] [DIS] Release published in Play Store
8588
- [ ] [COM] Inform via chat that release is out
8689
- [ ] [GIT] Merge `master` into `release/M.m.p`, fixing all the conflicts that could happen, in owncloud/android
8790
- [ ] [GIT] Merge without rebasing `release/M.m.p` branch into `master`, in owncloud/android

‎.github/workflows/android-instrumented-data-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
24+
uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a #v5.5.0
2525
with:
2626
java-version: '17'
2727
distribution: 'temurin'
@@ -33,7 +33,7 @@ jobs:
3333
sudo udevadm trigger --name-match=kvm
3434
3535
- name: Run Instrumented Data Tests with emulator
36-
uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a #v2.37.0
36+
uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d #v2.38.0
3737
with:
3838
api-level: 33
3939
target: google_apis

‎.github/workflows/android-unit-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2222

2323
- name: Set up JDK 17
24-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
24+
uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a #v5.5.0
2525
with:
2626
java-version: '17'
2727
distribution: 'temurin'
2828

2929
- name: Set up Gradle
30-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
30+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 #v6.2.0
3131

3232
- name: Build with Gradle
3333
run: ./gradlew assembleDebug

‎.github/workflows/build-apk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
8484
# Set Java-JDK version
8585
- name: Setup JDK
86-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
86+
uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a #v5.5.0
8787
with:
8888
distribution: 'temurin'
8989
java-version: '17'

‎.github/workflows/detekt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
2626
- name: Set up JDK 17
27-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
27+
uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a #v5.5.0
2828
with:
2929
java-version: '17'
3030
distribution: 'temurin'
3131

3232
# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
3333
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
3434
- name: Setup Gradle
35-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
35+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 #v6.2.0
3636
- name: detekt execution
3737
run: ./gradlew detekt

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
13-
- uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
13+
- uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 #v6.2.0
1414
with:
1515
validate-wrappers: true

‎.github/workflows/sbom.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
# Set up Java 17 (required by Gradle and CycloneDX plugin)
4848
- name: Set up JDK 17
49-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
49+
uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a #v5.5.0
5050
with:
5151
java-version: '17'
5252
distribution: 'temurin'

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
ext {
33
// SDK
44
sdkCompileVersion = 36
5-
sdkMinVersion = 24
5+
sdkMinVersion = 28
66
sdkTargetVersion = 36
77
}
88

‎changelog/unreleased/4865‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Change: Bump AGP from 8.7.2 to 9.2.1
2+
3+
Android Gradle Plugin (AGP) has been updated from version 8.7.2 to 9.2.1, along
4+
with other dependencies required to build the app with this new version.
5+
6+
https://github.com/owncloud/android/pull/4865

0 commit comments

Comments
 (0)