diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e186dac9f6234ed438241864a3d21f8a75db91a0..7aac894420445e73d0f0c60d32a616e7db3d0ff8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,9 @@ build-staging: init_submodules: stage: gitlab_release + rules: + - if: '$CI_COMMIT_REF_PROTECTED == "true"' + - when: manual script: - git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo artifacts: diff --git a/app/build.gradle b/app/build.gradle index 5c806d3485d9a989a1ec482be9d6efd74471f509..40111597fe16a60fc772dd17429327bd618dc673 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -253,7 +253,7 @@ dependencies { implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2 implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5' // remove after entire switch to lib v2 implementation 'com.google.code.gson:gson:2.10.1' - implementation("foundation.e:Nextcloud-Android-Library:2.0.2-u2.17-release") { + implementation("foundation.e:Nextcloud-Android-Library:2.0.3-u2.17-release") { exclude group: 'foundation.e.dav4jvm', module: 'dav4jvm' exclude group: 'com.gitlab.bitfireAT', module: 'dav4jvm' exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version