diff options
| -rw-r--r-- | gradle.properties | 1 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 2 | ||||
| -rw-r--r-- | keystore/debug.keystore | bin | 0 -> 2107 bytes | |||
| -rw-r--r-- | ui/build.gradle.kts | 18 | ||||
| -rw-r--r-- | ui/src/debug/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/updater/Updater.kt | 7 | ||||
| -rw-r--r-- | ui/src/main/res/values/strings.xml | 2 |
7 files changed, 26 insertions, 6 deletions
diff --git a/gradle.properties b/gradle.properties index 71a3adbe..a881ba1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ wireguardVersionCode=503 wireguardVersionName=1.0.20230508 wireguardPackageName=com.wireguard.android +wireguardApplicationID=eu.m7n.wireguard.android # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ca89ae86..121f54f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,7 @@ [versions] agp = "8.0.1" grpc = "1.55.1" +grgit = "5.2.0" kotlin = "1.8.21" protobuf = "0.9.3" protoc = "3.22.4" @@ -35,5 +36,6 @@ zxing-android-embedded = "com.journeyapps:zxing-android-embedded:4.3.0" android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } google-protobuf = { id = "com.google.protobuf", version.ref = "protobuf" } +ajoberstar-grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } 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/ui/build.gradle.kts b/ui/build.gradle.kts index d5ce5997..22bfe813 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -4,11 +4,13 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile val pkg: String = providers.gradleProperty("wireguardPackageName").get() +val appID: String = providers.gradleProperty("wireguardApplicationID").get() plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.kapt) + alias(libs.plugins.ajoberstar.grgit) } android { @@ -20,11 +22,14 @@ android { } namespace = pkg defaultConfig { - applicationId = pkg + applicationId = appID minSdk = 21 targetSdk = 33 versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt() - versionName = providers.gradleProperty("wireguardVersionName").get() + versionName = grgit.describe { + tags = true + always = true + }.replace('-', '.') buildConfigField("int", "MIN_SDK_VERSION", minSdk.toString()) } compileOptions { @@ -32,6 +37,14 @@ android { targetCompatibility = JavaVersion.VERSION_17 isCoreLibraryDesugaringEnabled = true } + signingConfigs { + named("debug") { + storeFile = File("/src/wireguard-android/keystore/debug.keystore") + storePassword = "android" + keyAlias = "androiddebugkey" + keyPassword = "android" + } + } buildTypes { release { isMinifyEnabled = true @@ -47,6 +60,7 @@ android { debug { applicationIdSuffix = ".debug" versionNameSuffix = "-debug" + signingConfig = signingConfigs.getByName("debug") } } lint { 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/java/com/wireguard/android/updater/Updater.kt b/ui/src/main/java/com/wireguard/android/updater/Updater.kt index fabfae92..6781a60d 100644 --- a/ui/src/main/java/com/wireguard/android/updater/Updater.kt +++ b/ui/src/main/java/com/wireguard/android/updater/Updater.kt @@ -146,7 +146,10 @@ object Updater { throw InvalidParameterException("Version has no parts") parts = ULongArray(strParts.size) for (i in parts.indices) { - parts[i] = strParts[i].toULong() + if (strParts[i][0] == 'g') + parts[i] = strParts[i].substring(1).toULong(16) + else + parts[i] = strParts[i].toULong() } } @@ -412,4 +415,4 @@ object Updater { context.startActivity(start) } } -}
\ No newline at end of file +} diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml index a550cc1b..a1364123 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> |