Proton/android-mail
1
0
Fork 0
mirror of https://github.com/ProtonMail/android-mail.git synced 2026-05-15 09:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set ndkVersion explicitly

Browse Source 
NOJIRA
This commit is contained in:
Niccolò Forlini
2025-10-16 15:52:02 +02:00
parent 40ed1f9be0
commit ebcb063fa0
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app-configuration.properties
+1
View File
@@ -2,6 +2,7 @@ applicationId=ch.protonmail.android
compileSdk=35 compileSdk=35
minSdk=29 minSdk=29
targetSdk=35 targetSdk=35
ndkVersion=28.1.13356709
testInstrumentationRunner=ch.protonmail.android.uitest.HiltTestRunner testInstrumentationRunner=ch.protonmail.android.uitest.HiltTestRunner
versionCode=1 versionCode=1
versionName=7.0.15 versionName=7.0.15
app/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,6 @@
* along with Proton Mail. If not, see <https://www.gnu.org/licenses/>. * along with Proton Mail. If not, see <https://www.gnu.org/licenses/>.
*/ */
import java.util.Properties
import com.android.build.api.dsl.VariantDimension import com.android.build.api.dsl.VariantDimension
import configuration.extensions.protonEnvironment import configuration.extensions.protonEnvironment
@@ -54,6 +53,7 @@ android {
applicationId = AppConfiguration.applicationId.get() applicationId = AppConfiguration.applicationId.get()
minSdk = AppConfiguration.minSdk.get() minSdk = AppConfiguration.minSdk.get()
targetSdk = AppConfiguration.targetSdk.get() targetSdk = AppConfiguration.targetSdk.get()
ndkVersion = AppConfiguration.ndkVersion.get()
versionCode = AppConfiguration.versionCode.get() versionCode = AppConfiguration.versionCode.get()
versionName = AppConfiguration.versionName.get() versionName = AppConfiguration.versionName.get()
build-plugin/src/main/kotlin/ch/protonmail/android/mail/plugin/ApplicationConfigPlugin.kt
+2
View File
@@ -37,6 +37,7 @@ abstract class ConfigExtension(project: Project) {
abstract val compileSdk: Property<Int> abstract val compileSdk: Property<Int>
abstract val minSdk: Property<Int> abstract val minSdk: Property<Int>
abstract val targetSdk: Property<Int> abstract val targetSdk: Property<Int>
abstract val ndkVersion: Property<String>
abstract val testInstrumentationRunner: Property<String> abstract val testInstrumentationRunner: Property<String>
abstract val versionCode: Property<Int> abstract val versionCode: Property<Int>
abstract val versionName: Property<String> abstract val versionName: Property<String>
@@ -52,6 +53,7 @@ abstract class ConfigExtension(project: Project) {
compileSdk.convention(properties.getProperty("compileSdk").toInt()) compileSdk.convention(properties.getProperty("compileSdk").toInt())
minSdk.convention(properties.getProperty("minSdk").toInt()) minSdk.convention(properties.getProperty("minSdk").toInt())
targetSdk.convention(properties.getProperty("targetSdk").toInt()) targetSdk.convention(properties.getProperty("targetSdk").toInt())
ndkVersion.convention(properties.getProperty("ndkVersion"))
testInstrumentationRunner.convention(properties.getProperty("testInstrumentationRunner")) testInstrumentationRunner.convention(properties.getProperty("testInstrumentationRunner"))
versionCode.convention(properties.getProperty("versionCode").toInt()) versionCode.convention(properties.getProperty("versionCode").toInt())
versionName.convention(properties.getProperty("versionName")) versionName.convention(properties.getProperty("versionName"))