greg
/
thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master' 

Release

See merge request sschueller/peertube!26
This commit is contained in:
Stefan Schüller 2021-10-05 07:34:42 +00:00
parent b2c934db21 b4881c2a2d
commit 1d678fa86d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -58,7 +58,7 @@ ensureContainer:
# https://levelup.gitconnected.com/semantic-versioning-and-release-automation-on-gitlab-9ba16af0c21 # https://levelup.gitconnected.com/semantic-versioning-and-release-automation-on-gitlab-9ba16af0c21
fetch-semantic-version: fetch-semantic-version:
image: node:13 image: node:14
stage: fetch-version stage: fetch-version
only: only:
refs: refs:

1
gradle.properties
View File

@ -13,6 +13,7 @@ android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
# https://youtrack.jetbrains.com/issue/KT-40750
kapt.use.worker.api=false kapt.use.worker.api=false
kapt.incremental.apt=false kapt.incremental.apt=false