Setup core snapshot support

This commit is contained in:
Vincent Brison 2021-12-02 16:11:39 +01:00 committed by Zorica Stojchevska
parent 2f1d778ce0
commit 94f2101b1d
5 changed files with 14 additions and 2 deletions

View File

@ -1,6 +1,9 @@
default:
image: $CI_REGISTRY/protonvpn/android/android-app-new:branch-compose
variables:
GIT_SUBMODULE_STRATEGY: recursive
before_script:
- export JAVA_TOOL_OPTIONS="-Dhttp.proxyHost=$( echo ${http_proxy##http://} | cut -d':' -f1 ) -Dhttp.proxyPort=$( echo ${http_proxy##http://} | cut -d':' -f2 ) -Dhttps.proxyHost=$( echo ${https_proxy##http://} | cut -d':' -f1 ) -Dhttps.proxyPort=$( echo ${https_proxy##http://} | cut -d':' -f2 ) -Dhttp.nonProxyHosts=\"$( echo $no_proxy | tr ',' '|' )\""
- export GRADLE_USER_HOME=`pwd`/.gradle

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "proton-libs"]
path = proton-libs
url = ../../../proton/mobile/android/proton-libs

View File

@ -19,6 +19,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

1
proton-libs Submodule

@ -0,0 +1 @@
Subproject commit 82be4ab5a9fda57fa21ddbb631d9dab08818e6f3

View File

@ -28,6 +28,10 @@ println("Modules: ${modules.sorted().joinToString()}")
for (p in projects) includeBuild(p)
for (m in modules) include(m)
// Uncomment this line to use core libs from git submodule instead of using artifacts published on maven.
// See https://docs.gradle.org/current/userguide/composite_builds.html
// includeBuild("proton-libs")
pluginManagement {
repositories {
mavenCentral()
@ -46,7 +50,8 @@ fun File.projectsAndModules() : Pair<Set<String>, Set<String>> {
"buildSrc",
"config",
"build",
"src"
"src",
"proton-libs"
)
fun File.childrenDirectories() = listFiles { _, name -> name !in blacklist }!!