android: Make it possible to configure ndkVersion from extension

CHANGELOG.md

@@ -37,6 +37,7 @@ android {
 ### Other Changes
 
 - **android:** Use `ANDROID_BUILD_TOOLS_VERSION` env variable for `buildToolsVersion` if the option is not configured (#132)
+- **android:** Add the option `redmadrobot.android.ndkVersion` to specify NDK version for all android modules
 - **android:** Remove the workaround for Explicit API enabling as the issue has been [fixed](https://youtrack.jetbrains.com/issue/KT-37652) in Kotlin 1.9
 - **android:** Remove disabling of build features `aidl`, `renderScript` and `buildConfig` as they are already disabled by default in new versions of AGP
 - **kotlin:** Deprecate accessor `kotlinCompile`.

README.md

@@ -349,6 +349,9 @@ redmadrobot {
         // Build Tools version to be used in all android modules.
         buildToolsVersion = System.getenv("ANDROID_BUILD_TOOLS_VERSION")
 
+        // NDK version to be used in all android modules.
+        ndkVersion = System.getenv("ANDROID_NDK_VERSION")
+
         // Filter for test tasks that should be run on ':test'.
         testTasksFilter = { taskProvider -> taskProvider.name.endsWith("ReleaseUnitTest") }
 

infrastructure-android/src/main/kotlin/android/AndroidOptions.kt

@@ -33,6 +33,12 @@ public interface AndroidOptions {
      */
     public val buildToolsVersion: Property<String>
 
+    /**
+     * NDK to be used in all android modules.
+     * By default, uses the version from the environment variable `ANDROID_NDK_VERSION` if it is set.
+     */
+    public val ndkVersion: Property<String>
+
     /**
      * Filters test tasks that should be run on ':test'.
      * It is useful if you don't want to run tests for all build variants when run 'test' task.

infrastructure-android/src/main/kotlin/android/AndroidOptionsImpl.kt

@@ -31,6 +31,9 @@ internal abstract class AndroidOptionsImpl @Inject constructor(
         buildToolsVersion
             .convention(providers.environmentVariable("ANDROID_BUILD_TOOLS_VERSION"))
             .finalizeValueOnRead()
+        ndkVersion
+            .convention(providers.environmentVariable("ANDROID_NDK_VERSION"))
+            .finalizeValueOnRead()
         testTasksFilter
             .convention { taskProvider -> taskProvider.name.endsWith("ReleaseUnitTest") }
             .finalizeValueOnRead()
@@ -48,6 +51,7 @@ internal abstract class AndroidOptionsImpl @Inject constructor(
         targetSdk.convention(defaults.targetSdk)
         compileSdk.convention(defaults.compileSdk)
         buildToolsVersion.convention(defaults.buildToolsVersion)
+        ndkVersion.convention(defaults.ndkVersion)
         testTasksFilter.convention(defaults.testTasksFilter)
         setTestDefaults(defaults.testOptions)
     }

infrastructure-android/src/main/kotlin/android/BaseAndroidPlugin.kt

@@ -56,10 +56,6 @@ public abstract class BaseAndroidPlugin internal constructor() : InfrastructureP
 }
 
 private fun Project.configureAndroid() = android {
-    // Set NDK version from env variable if exists
-    val requestedNdkVersion = System.getenv("ANDROID_NDK_VERSION")
-    if (requestedNdkVersion != null) ndkVersion = requestedNdkVersion
-
     buildFeatures {
         shaders = false
     }
@@ -78,6 +74,7 @@ private fun CommonExtension.applyAndroidOptions(
 ) {
     setCompileSdkVersion(options.compileSdk.get())
     options.buildToolsVersion.ifPresent { buildToolsVersion = it }
+    options.ndkVersion.ifPresent { ndkVersion = it }
 
     defaultConfig {
         minSdk = options.minSdk.get()