From 01d82451402945c68a4dbcb6798924154bba60a5 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 24 Apr 2024 07:08:12 +0200 Subject: [PATCH 1/2] Bump to 3.29.0 Signed-off-by: tobiasKaminsky --- app/build.gradle | 2 +- build.gradle | 2 +- .../metadata/android/en-US/changelogs/30290090.txt | 12 ++++++++++++ gradle/verification-metadata.xml | 10 ++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/30290090.txt diff --git a/app/build.gradle b/app/build.gradle index d6642a773b49..ab4c166ac8ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -79,7 +79,7 @@ configurations.configureEach { def versionMajor = 3 def versionMinor = 29 def versionPatch = 0 -def versionBuild = 51 // 0-50=Alpha / 51-98=RC / 90-99=stable +def versionBuild = 90 // 0-50=Alpha / 51-98=RC / 90-99=stable def ndkEnv = new HashMap() diff --git a/build.gradle b/build.gradle index 5f900fdc4fcb..d075c7d8c34c 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ */ buildscript { ext { - androidLibraryVersion = "3c0c530e87" + androidLibraryVersion = "2.19.0" androidPluginVersion = '8.3.2' androidxMediaVersion = '1.3.1' androidxTestVersion = "1.5.0" diff --git a/fastlane/metadata/android/en-US/changelogs/30290090.txt b/fastlane/metadata/android/en-US/changelogs/30290090.txt new file mode 100644 index 000000000000..5b3df11040a3 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/30290090.txt @@ -0,0 +1,12 @@ +## 3.29.0 (April 24, 2024) + +- NC Assistant +- Client certificates +- Personal files view +- REUSE compliance +- Bugfixes + + +Minimum: NC 16 Server, Android 7.0 Nougat + +For a full list, please see https://github.com/nextcloud/android/milestone/89 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 47e29aec4c98..ef5a88426f83 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -5151,6 +5151,16 @@ + + + + + + + + From a073ef599f7d1cdd73bd3c63d718a5630362cea3 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 24 Apr 2024 07:49:06 +0200 Subject: [PATCH 2/2] fix test corrext spdx Signed-off-by: tobiasKaminsky --- .../com/owncloud/android/utils/theme/CapabilityUtilsIT.kt | 7 ++++--- fastlane/metadata/android/en-US/changelogs/30290051.txt | 6 ++++++ fastlane/metadata/android/en-US/changelogs/30290090.txt | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt b/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt index 0746c4dd845b..98b410f6707d 100644 --- a/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt +++ b/app/src/androidTest/java/com/owncloud/android/utils/theme/CapabilityUtilsIT.kt @@ -17,11 +17,12 @@ import org.junit.Test class CapabilityUtilsIT : AbstractIT() { @Test fun checkOutdatedWarning() { + assertFalse(test(NextcloudVersion.nextcloud_28)) assertFalse(test(NextcloudVersion.nextcloud_27)) - assertFalse(test(NextcloudVersion.nextcloud_26)) - assertFalse(test(NextcloudVersion.nextcloud_25)) - assertFalse(test(NextcloudVersion.nextcloud_24)) + assertTrue(test(NextcloudVersion.nextcloud_26)) + assertTrue(test(NextcloudVersion.nextcloud_25)) + assertTrue(test(NextcloudVersion.nextcloud_24)) assertTrue(test(NextcloudVersion.nextcloud_23)) assertTrue(test(NextcloudVersion.nextcloud_22)) assertTrue(test(NextcloudVersion.nextcloud_21)) diff --git a/fastlane/metadata/android/en-US/changelogs/30290051.txt b/fastlane/metadata/android/en-US/changelogs/30290051.txt index 5083bbeef638..f18c0c9e1afd 100644 --- a/fastlane/metadata/android/en-US/changelogs/30290051.txt +++ b/fastlane/metadata/android/en-US/changelogs/30290051.txt @@ -1,3 +1,9 @@ +# +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2024 Tobias Kaminsky +# SPDX-License-Identifier: AGPL-3.0-or-later +# + ## 3.29.0 RC1 (April 17, 2024) - NC Assistant diff --git a/fastlane/metadata/android/en-US/changelogs/30290090.txt b/fastlane/metadata/android/en-US/changelogs/30290090.txt index 5b3df11040a3..d2ba929f8d72 100644 --- a/fastlane/metadata/android/en-US/changelogs/30290090.txt +++ b/fastlane/metadata/android/en-US/changelogs/30290090.txt @@ -1,3 +1,9 @@ +# +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2024 Tobias Kaminsky +# SPDX-License-Identifier: AGPL-3.0-or-later +# + ## 3.29.0 (April 24, 2024) - NC Assistant