Merge branch 'develop' into 'master'

Release See merge request sschueller/peertube!26
2021-10-05 07:34:42 +00:00 · 2021-10-05 07:34:42 +00:00 · 1d678fa86d
parent b2c934db21 b4881c2a2d
commit 1d678fa86d
2 changed files with 2 additions and 1 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -58,7 +58,7 @@ ensureContainer:

 # https://levelup.gitconnected.com/semantic-versioning-and-release-automation-on-gitlab-9ba16af0c21
 fetch-semantic-version:
-  image: node:13
+  image: node:14
  stage: fetch-version
  only:
    refs:
--- a/gradle.properties
+++ b/gradle.properties
@ -13,6 +13,7 @@ android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m

+# https://youtrack.jetbrains.com/issue/KT-40750
 kapt.use.worker.api=false
 kapt.incremental.apt=false