From 276d339afe2eedea2829602d62341dea85795250 Mon Sep 17 00:00:00 2001 From: Nick Aquina Date: Mon, 22 May 2023 17:29:32 +0200 Subject: [PATCH 1/2] Update build tools and SDK version in builder_setup.sh --- builder_setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder_setup.sh b/builder_setup.sh index 1e450017..f31778a9 100755 --- a/builder_setup.sh +++ b/builder_setup.sh @@ -6,12 +6,12 @@ SDK_DIR=${HOME}/android-sdk -# current as of 20220425 +# current as of 20230522 # see https://developer.android.com/studio/#downloads "Command line tools only" -SDK_VERSION=8512546 +SDK_VERSION=9477386 # Always use latest from https://developer.android.com/studio/releases/build-tools -BUILD_TOOLS_VERSION=29.0.3 +BUILD_TOOLS_VERSION=33.0.2 # see app/build.gradle for "targetSdkVersion" PLATFORM_VERSION=31 From cbf0ec8f7086091254d452945682d32be8cf5993 Mon Sep 17 00:00:00 2001 From: Nick Aquina Date: Mon, 22 May 2023 18:26:38 +0200 Subject: [PATCH 2/2] Release 3.1.0 --- CHANGES.md | 10 ++++++++++ app/build.gradle | 4 ++-- build_app_git.sh | 2 +- build_app_tar.sh | 2 +- create_release_tar.sh | 2 +- fastlane/metadata/android/en-US/changelogs/22.txt | 4 ++++ 6 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/22.txt diff --git a/CHANGES.md b/CHANGES.md index 0dc8195a..d5a5e919 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,15 @@ # Changelog +## 3.1.0 (2023-05-22) +- Remove API v2 support ([#382](https://github.com/eduvpn/android/pull/383)) +- German translation ([#386](https://github.com/eduvpn/android/pull/386)) +- Support Minisign prehashed signature format ([#361](https://github.com/eduvpn/android/pull/361)) +- Fix no keyword search for institutes ([#384](https://github.com/eduvpn/android/pull/384)) +- Fix sorting Institute Access and Secure Internet ([#387](https://github.com/eduvpn/android/pull/387)) +- Remove save button ([#383](https://github.com/eduvpn/android/pull/383)) +- Fix "null" in notification when using secure internet ([#390](https://github.com/eduvpn/android/pull/390)) +- Update OkHttp to 4.10.0 ([#390](https://github.com/eduvpn/android/pull/391)) + ## 3.0.1 (2022-11-04) - update ics-openvpn - Remove secure-preferences ([#117](https://github.com/eduvpn/android/issues/117)) diff --git a/app/build.gradle b/app/build.gradle index 0dcc95fc..9d9284bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "nl.eduvpn.app" minSdkVersion 21 targetSdkVersion 31 - versionCode 21 - versionName "3.0.1" + versionCode 22 + versionName "3.1.0" ndkVersion "21.0.6113669" vectorDrawables.useSupportLibrary = true diff --git a/build_app_git.sh b/build_app_git.sh index 42e69186..db2338f8 100755 --- a/build_app_git.sh +++ b/build_app_git.sh @@ -8,7 +8,7 @@ SDK_DIR=${HOME}/android-sdk KEY_STORE=${HOME}/android.jks GIT_REPO=https://github.com/eduvpn/android -GIT_TAG=3.0.1 +GIT_TAG=3.1.0 #GIT_TAG=master PROJECT_DIR=${HOME}/Projects diff --git a/build_app_tar.sh b/build_app_tar.sh index 5d123d2d..974cdc6a 100755 --- a/build_app_tar.sh +++ b/build_app_tar.sh @@ -7,7 +7,7 @@ SDK_DIR=${HOME}/android-sdk KEY_STORE=${HOME}/android.jks -V=3.0.1 +V=3.1.0 DOWNLOAD_URL=https://github.com/eduvpn/android/releases/download/${V}/eduvpn-android-${V}.tar.xz PROJECT_DIR=${HOME}/Projects diff --git a/create_release_tar.sh b/create_release_tar.sh index 1d310672..bc92d55b 100755 --- a/create_release_tar.sh +++ b/create_release_tar.sh @@ -1,7 +1,7 @@ #!/bin/sh GIT_REPO=https://github.com/eduvpn/android -GIT_TAG=3.0.1 +GIT_TAG=3.1.0 #GIT_TAG=master PROJECT_DIR=${HOME}/Projects diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt new file mode 100644 index 00000000..6af3edb5 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/22.txt @@ -0,0 +1,4 @@ +* Remove API v2 support +* Added German translation +* Remove save button +* Bug fixes