Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Target Android 15 instead of Android 14 #158

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Target Android 15 instead of Android 14 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c48f9a
Fix GitHub publishing:
msimonides-proton Dec 18, 2024
2964259
Switch back to using OAUTH for GitHub publishing.
msimonides-proton Dec 18, 2024
6529d42
Update guesthole servers
proton-ci Jan 9, 2025
24942af
Add fdroid metadata
proton-ci Jan 9, 2025
e1ebae6
Target Android 15 instead of Android 14
tegridyfarmer Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitlab-ci-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,13 @@ sync-app:
- /^release/
except:
- schedules
variables:
OAUTH_URL: "https://oauth2:${GITHUB_CLI_TOKEN}@github.com/ProtonVPN/android-app.git"
script:
- apt update && apt-get install -y connect-proxy
- git remote add public $PUBLIC_REPO_URL
- git remote add public $OAUTH_URL
# Checkout the branch before the lfs commands for REF_NAME to be recognized as a local name.
- git checkout $CI_COMMIT_REF_NAME
- |
if grep -q "filter=lfs" .gitattributes 2>/dev/null; then
echo "Git LFS detected. Handling LFS objects..."
Expand All @@ -204,7 +207,6 @@ sync-app:
else
echo "Git LFS not detected. Skipping LFS steps."
fi
- git checkout $CI_COMMIT_REF_NAME
# Push current branch to github
- git push public $CI_COMMIT_REF_NAME
# Push the latest tag we can find
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def debugKeystorePath = System.getenv("DEBUG_KEYSTORE_FILE")
android {
namespace "com.protonvpn.android"
testNamespace 'com.protonvpn'
buildToolsVersion "34.0.0"
buildToolsVersion "35.0.0"
ndkVersion rootProject.ext.compileNdkVersion
compileSdkVersion rootProject.ext.compileSdkVersion
useLibrary 'org.apache.http.legacy'
Expand All @@ -163,7 +163,7 @@ android {
defaultConfig {
applicationId appId
minSdkVersion rootProject.ext.minSdkVersion // See also build flavors.
targetSdkVersion 34
targetSdkVersion 35
multiDexEnabled true
versionName helpers.fullVersionName
versionCode helpers.getVersionCode()
Expand Down
Loading