diff options
| author | jacquarg <guillaume.jacquart@hoodbrains.com> | 2022-02-21 21:15:38 +0100 |
|---|---|---|
| committer | jacquarg <guillaume.jacquart@hoodbrains.com> | 2022-02-21 21:15:38 +0100 |
| commit | 9d63c322d2a79c8bd8308997368976a69037149e (patch) | |
| tree | 196eacef8231fea58703744917a0d56894071684 | |
| parent | 34232a27ad8a7eafd48a562566480fd298bbaf95 (diff) | |
Fix CI
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | app/build.gradle | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b61aa3e..063dd65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,16 +85,16 @@ test-debug: build-full: stage: build script: - - ./gradlew build + - ./gradlew assembleDebug assembleRelease rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' variables: MAPBOX_KEY: $MAPBOX_KEY_PROD MAPBOX_SECRET_KEY: $MAPBOX_SECRET_KEY_PROD when: always - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"' when: always - when: never artifacts: diff --git a/app/build.gradle b/app/build.gradle index 224ea8a..87db2fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,9 +41,17 @@ android { // expected by the android gradle plugin. flavorDimensions 'os' productFlavors { - e { + e29 { applicationIdSuffix '.e' dimension 'os' + minSdkVersion 26 + targetSdkVersion 29 + } + e30 { + applicationIdSuffix '.e' + dimension 'os' + minSdkVersion 30 + targetSdkVersion 30 } // google { // applicationIdSuffix '.google' @@ -98,9 +106,10 @@ dependencies { //googleImplementation project(":privacymodulesgoogle") // include the e specific version of the modules, just for the e flavor - implementation 'foundation.e:privacymodule.trackerfilter:0.2.0-dev' - implementation 'foundation.e:privacymodule.api:0.5.0-dev' - implementation 'foundation.e:privacymodule.e-29:0.4.1' + implementation 'foundation.e:privacymodule.trackerfilter:0.2.0' + implementation 'foundation.e:privacymodule.api:0.5.0' + e29Implementation 'foundation.e:privacymodule.e-29:0.4.2' + e30Implementation 'foundation.e:privacymodule.e-30:0.4.2' implementation 'foundation.e:privacymodule.tor:0.2.1' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' |