diff options
| -rw-r--r-- | keystore/debug.keystore | bin | 0 -> 2107 bytes | |||
| -rw-r--r-- | tunnel/build.gradle | 9 | ||||
| -rw-r--r-- | ui/build.gradle | 17 | ||||
| -rw-r--r-- | ui/src/debug/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | ui/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | version.gradle | 3 |
6 files changed, 29 insertions, 4 deletions
diff --git a/keystore/debug.keystore b/keystore/debug.keystore Binary files differnew file mode 100644 index 00000000..c2655107 --- /dev/null +++ b/keystore/debug.keystore diff --git a/tunnel/build.gradle b/tunnel/build.gradle index 8707c008..a0ea31ae 100644 --- a/tunnel/build.gradle +++ b/tunnel/build.gradle @@ -56,6 +56,15 @@ android { disable('LongLogTag') disable('NewApi') // Desugaring! } + ndkVersion "21.3.6528147" + splits { + abi { + enable true + reset() + include "arm64-v8a", "armeabi-v7a" + universalApk false + } + } } dependencies { diff --git a/ui/build.gradle b/ui/build.gradle index e95d1779..91a6c461 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -20,7 +20,7 @@ android { } namespace = 'com.wireguard.android' defaultConfig { - applicationId 'com.wireguard.android' + applicationId 'eu.m7n.wireguard.android' minSdkVersion 21 targetSdkVersion 30 versionCode wireguardVersionCode @@ -32,11 +32,25 @@ android { targetCompatibility JavaVersion.VERSION_1_8 coreLibraryDesugaringEnabled = true } + splits { + abi { + enable true + reset() + include "arm64-v8a", "armeabi-v7a" + universalApk false + } + } if (keystorePropertiesFile.exists()) { final def keystoreProperties = new Properties() 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'] @@ -61,6 +75,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 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name" translatable="false">WireGuard β</string> + <string name="app_name" translatable="false">(m7n.eu) WireGuard β</string> </resources> diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index 8a55a49b..320b29e2 100644 --- a/ui/src/main/res/values/strings.xml +++ b/ui/src/main/res/values/strings.xml @@ -63,7 +63,7 @@ <string name="allow_remote_control_intents_summary_on">External apps may toggle tunnels (advanced)</string> <string name="allow_remote_control_intents_title">Allow remote control apps</string> <string name="allowed_ips">Allowed IPs</string> - <string name="app_name" translatable="false">WireGuard</string> + <string name="app_name" translatable="false">(m7n.eu) WireGuard</string> <string name="bad_config_context">%1$s\'s %2$s</string> <string name="bad_config_context_top_level">%s</string> <string name="bad_config_error">%1$s in %2$s</string> 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() } } |