Skip to content

Commit

Permalink
Merge branch 'release/2.9.0' into 'master'
Browse files Browse the repository at this point in the history
Release 2.9.0

See merge request ProtonVPN/android/android-app-new!512
  • Loading branch information
mateusz-markowicz committed Oct 7, 2021
2 parents 4fa59a2 + 796e29c commit b0a51e6
Show file tree
Hide file tree
Showing 82 changed files with 1,623 additions and 1,076 deletions.
1 change: 0 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
- .gradle
- '**/build'

detekt analysis:
stage: analyze
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,6 @@ dependencies {
detektPlugins 'pm.algirdas.detekt:codeanalysis:0.3.2'
detektPlugins 'io.gitlab.arturbosch.detekt:detekt-formatting:1.9.1'

implementation(name:'govpn', ext:'aar')
implementation 'androidx.test.espresso:espresso-idling-resource:3.3.0'
// 3.10 of commons-lang3 causes NoClassDefFoundError on start (to be investigated)
implementation 'org.apache.commons:commons-lang3:3.9'
Expand Down Expand Up @@ -588,6 +587,7 @@ dependencies {
kapt 'com.github.bumptech.glide:compiler:4.12.0'

// Proton Core libs
implementation 'me.proton.vpn:go-vpn-lib:0.1.5'
implementation 'me.proton.core:domain:1.0.3'
implementation 'me.proton.core:network:1.1.3'
implementation "me.proton.core:util-kotlin:0.2.5"
Expand Down
Loading

0 comments on commit b0a51e6

Please sign in to comment.