From 5742cd19f34584c4eda11f2a40ff3c41474ea340 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 11 Dec 2021 20:29:42 +0100 Subject: version: automatically generate version string from tag Signed-off-by: Mikael Magnusson --- version.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/version.gradle b/version.gradle index 6137523a..3aa6a907 100644 --- a/version.gradle +++ b/version.gradle @@ -1,6 +1,7 @@ + buildscript { ext { wireguardVersionCode = 492 - wireguardVersionName = '1.0.20220516' + wireguardVersionName = 'git describe --tags HEAD'.execute().text.trim() } } -- cgit v1.2.3 From b37e99bb6b4bb6099fa898be6391c7a25805c5a5 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 10 Apr 2019 00:04:04 +0200 Subject: m7n: local build modifications MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use custom application id: eu.m7n.wireguard.android Set app names to (m7n.eu) WireGuard and (m7n.eu) WireGuard β Limit ABIs to arm64-v8a and x86_64 Use NDK 21.3 --- tunnel/build.gradle | 9 +++++++++ ui/build.gradle | 11 ++++++++++- ui/src/debug/res/values/strings.xml | 2 +- ui/src/main/res/values/strings.xml | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tunnel/build.gradle b/tunnel/build.gradle index ff1aad19..91217f39 100644 --- a/tunnel/build.gradle +++ b/tunnel/build.gradle @@ -47,6 +47,15 @@ android { disable('LongLogTag') disable('NewApi') // Desugaring! } + ndkVersion "21.3.6528147" + splits { + abi { + enable true + reset() + include "arm64-v8a", "x86_64" + universalApk false + } + } } dependencies { diff --git a/ui/build.gradle b/ui/build.gradle index 2bbbe539..f5fb22b3 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -19,7 +19,7 @@ android { viewBinding = true } defaultConfig { - applicationId 'com.wireguard.android' + applicationId 'eu.m7n.wireguard.android' minSdkVersion 21 targetSdkVersion 30 versionCode wireguardVersionCode @@ -31,6 +31,14 @@ android { targetCompatibility JavaVersion.VERSION_1_8 coreLibraryDesugaringEnabled = true } + splits { + abi { + enable true + reset() + include "arm64-v8a", "x86_64" + universalApk false + } + } if (keystorePropertiesFile.exists()) { final def keystoreProperties = new Properties() keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) @@ -60,6 +68,7 @@ android { warning('MissingTranslation') warning('ImpliedQuantity') } + ndkVersion "21.3.6528147" } dependencies { diff --git a/ui/src/debug/res/values/strings.xml b/ui/src/debug/res/values/strings.xml index 947b7381..af58a39d 100644 --- a/ui/src/debug/res/values/strings.xml +++ b/ui/src/debug/res/values/strings.xml @@ -1,4 +1,4 @@ - WireGuard β + (m7n.eu) WireGuard β diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 6c090199..fb6fad4b 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -63,7 +63,7 @@ External apps may toggle tunnels (advanced) Allow remote control apps Allowed IPs - WireGuard + (m7n.eu) WireGuard %1$s\'s %2$s %s %1$s in %2$s -- cgit v1.2.3 From e228b8ad7a715d65405a5c8d8f5d48767f0dbf52 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 2 Jun 2022 23:19:38 +0200 Subject: WIP: build arm --- tunnel/build.gradle | 2 +- ui/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tunnel/build.gradle b/tunnel/build.gradle index 91217f39..74f91f5f 100644 --- a/tunnel/build.gradle +++ b/tunnel/build.gradle @@ -52,7 +52,7 @@ android { abi { enable true reset() - include "arm64-v8a", "x86_64" + include "arm64-v8a", "armeabi-v7a" universalApk false } } diff --git a/ui/build.gradle b/ui/build.gradle index f5fb22b3..e0bf1cb4 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -35,7 +35,7 @@ android { abi { enable true reset() - include "arm64-v8a", "x86_64" + include "arm64-v8a", "armeabi-v7a" universalApk false } } -- cgit v1.2.3 From b7f0798ff3c0582b9289fd91acba348e99a18191 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 11 Feb 2023 22:54:46 +0100 Subject: ui: add debug keystore Allow sharing between machines. --- keystore/debug.keystore | Bin 0 -> 2107 bytes ui/build.gradle | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 keystore/debug.keystore diff --git a/keystore/debug.keystore b/keystore/debug.keystore new file mode 100644 index 00000000..c2655107 Binary files /dev/null and b/keystore/debug.keystore differ diff --git a/ui/build.gradle b/ui/build.gradle index e0bf1cb4..a79ffbed 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -44,6 +44,12 @@ android { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) signingConfigs { + debug { + storeFile file('../keystore/debug.keystore') + storePassword "android" + keyAlias "androiddebugkey" + keyPassword "android" + } release { keyAlias keystoreProperties['keyAlias'] keyPassword keystoreProperties['keyPassword'] -- cgit v1.2.3 From c502a12531fa26859f1614bd2c0d8bd50bc07380 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 23 Mar 2023 23:57:50 +0100 Subject: m7n: revert ndk pinning --- tunnel/build.gradle | 1 - ui/build.gradle | 1 - 2 files changed, 2 deletions(-) diff --git a/tunnel/build.gradle b/tunnel/build.gradle index 74f91f5f..0c18e05c 100644 --- a/tunnel/build.gradle +++ b/tunnel/build.gradle @@ -47,7 +47,6 @@ android { disable('LongLogTag') disable('NewApi') // Desugaring! } - ndkVersion "21.3.6528147" splits { abi { enable true diff --git a/ui/build.gradle b/ui/build.gradle index a79ffbed..1ac42e58 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -74,7 +74,6 @@ android { warning('MissingTranslation') warning('ImpliedQuantity') } - ndkVersion "21.3.6528147" } dependencies { -- cgit v1.2.3