diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c28ced6a35b6..da49af2286c8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -72,7 +72,7 @@ configurations.configureEach { val versionMajor = 35 val versionMinor = 0 val versionPatch = 0 -val versionBuild = 50 // 0-50=Alpha / 51-98=RC / 90-99=stable +val versionBuild = 51 // 0-50=Alpha / 51-98=RC / 90-99=stable val ndkEnv = buildMap { file("${project.rootDir}/ndk.env").readLines().forEach { 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 c22a759a602b..66e9673d9028 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 @@ -28,8 +28,6 @@ class CapabilityUtilsIT : AbstractIT() { assertTrue(test(NextcloudVersion.nextcloud_24)) assertTrue(test(NextcloudVersion.nextcloud_23)) assertTrue(test(NextcloudVersion.nextcloud_22)) - assertTrue(test(NextcloudVersion.nextcloud_21)) - assertTrue(test(OwnCloudVersion.nextcloud_20)) } @Test diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java index f08bde45fee9..becf8036954f 100644 --- a/app/src/main/java/com/owncloud/android/MainApp.java +++ b/app/src/main/java/com/owncloud/android/MainApp.java @@ -29,7 +29,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Resources; -import android.net.ConnectivityManager; import android.os.Bundle; import android.os.Environment; import android.os.StrictMode; @@ -78,7 +77,6 @@ import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.status.NextcloudVersion; -import com.owncloud.android.lib.resources.status.OCCapability; import com.owncloud.android.lib.resources.status.OwnCloudVersion; import com.owncloud.android.ui.activity.SyncedFoldersActivity; import com.owncloud.android.ui.notifications.NotificationUtils; @@ -87,7 +85,6 @@ import com.owncloud.android.utils.PermissionUtil; import com.owncloud.android.utils.ReceiversHelper; import com.owncloud.android.utils.SecurityUtils; -import com.owncloud.android.utils.theme.CapabilityUtils; import com.owncloud.android.utils.theme.ViewThemeUtils; import org.conscrypt.Conscrypt; @@ -130,7 +127,7 @@ */ public class MainApp extends Application implements HasAndroidInjector, NetworkChangeListener { public static final OwnCloudVersion OUTDATED_SERVER_VERSION = NextcloudVersion.nextcloud_30; - public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_20; + public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = NextcloudVersion.nextcloud_22; private static final String TAG = MainApp.class.getSimpleName(); public static final String DOT = "."; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d208c428a45e..dc5e41c100bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidCommonLibraryVersion = "0.33.2" androidGifDrawableVersion = "1.2.32" androidImageCropperVersion = "4.7.0" -androidLibraryVersion ="94372d7cbb8efe1c779ab8c2244a61510efafb28" +androidLibraryVersion ="rc-2.26.0" androidOpensslVersion = "3.5.6" androidPluginVersion = "9.3.2" androidsvgVersion = "1.4" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 60e15f9e4c31..35383bb8734a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -22527,6 +22527,14 @@ + + + + + + + +