override default android NDK

odemiral · Jan 30, 2021 · f42c355 · f42c355
1 parent 995e10e
commit f42c355
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -92,8 +92,6 @@ jobs:
           java-version: '8.0.265'
       - name: Setup Android SDK dir
         run: echo sdk.dir=$ANDROID_HOME > local.properties
-      - name: install default NDK for AGP
-        run: $ANDROID_HOME/tools/bin/sdkmanager "ndk;21.0.6113669"
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -102,8 +102,6 @@ jobs:
           java-version: '8.0.265'
       - name: Setup Android SDK dir
         run: echo sdk.dir=$ANDROID_HOME > local.properties
-      - name: install default NDK for AGP
-        run: $ANDROID_HOME/tools/bin/sdkmanager "ndk;21.0.6113669"
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -49,9 +49,6 @@ jobs:
       - name: Setup Android SDK dir
         if: matrix.os == 'macos-latest'
         run: echo sdk.dir=$ANDROID_HOME > local.properties
-      - name: install default NDK for AGP
-        if: matrix.os == 'macos-latest'
-        run: $ANDROID_HOME/tools/bin/sdkmanager "ndk;21.0.6113669"
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,7 @@ val kotlinxSerializationVer by extra { "1.0.1" }
 val kodeinLogVer by extra { "0.8.0" }
 val kodeinMemoryVer by extra { "0.5.0" }
 
-val androidNdkVer by extra { "21.0.6113669" } // CAUTION: also change in CI workflows!
+val androidNdkVer by extra { "21.3.6528147" } // CAUTION: also change in CI workflows!
 
 val currentOs = org.gradle.internal.os.OperatingSystem.current()!!
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
         maven(url = "https://dl.bintray.com/kodein-framework/kodein-dev")
     }
     dependencies {
-        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:5.3.3")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:5.4.0")
     }
 }