diff --git a/.github/scripts/install-ndk.sh b/.github/scripts/install-ndk.sh deleted file mode 100755 index f81dabb6c..000000000 --- a/.github/scripts/install-ndk.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -x - -export JAVA_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.xml.bind' -export PATH="$ANDROID_HOME"/tools/bin:$PATH -sdkmanager --install 'ndk;21.4.7075529' >/dev/null \ No newline at end of file diff --git a/.github/workflows/android-sonar.yml b/.github/workflows/android-sonar.yml index 035d139c7..3de82fe9e 100644 --- a/.github/workflows/android-sonar.yml +++ b/.github/workflows/android-sonar.yml @@ -15,9 +15,6 @@ jobs: with: java-version: 11 - - name: Install NDK - run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} - - name: Cache SonarCloud packages 🗄 uses: actions/cache@v1 with: diff --git a/.github/workflows/android-tests.yml b/.github/workflows/android-tests.yml index 7efb5fe21..d8978f5a8 100644 --- a/.github/workflows/android-tests.yml +++ b/.github/workflows/android-tests.yml @@ -22,13 +22,6 @@ jobs: with: java-version: 11 -# Try to install ndk in MacOS environment, when error occurs -# - name: Grant Permission for NDK install to Execute 👮‍ -# run: chmod +x ./.github/scripts/install-ndk.sh -# -# - name: Install NDK -# run: ./.github/scripts/install-ndk.sh - - name: Cache SonarCloud packages 🗄 uses: actions/cache@v1 with: diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 1d39e72db..28c6d023c 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -17,9 +17,6 @@ jobs: with: java-version: 12 - - name: Install NDK - run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" --sdk_root=${ANDROID_SDK_ROOT} - - name: Cache Gradle and wrapper 🗄 uses: actions/cache@v2 with: diff --git a/dependencies.gradle b/dependencies.gradle index aa6728019..359afbdfb 100755 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,7 +12,6 @@ ext.versions = [ versionNamePreReleaseNumber : null, isSnapshot : false, buildTools : '30.0.2', - ndk : '21.4.7075529', androidGradleVersion : '4.0.2', kotlinVersion : '1.3.72', ktx : '1.3.2', diff --git a/printer/build.gradle b/printer/build.gradle index 3ec54ab29..2802b6fa6 100644 --- a/printer/build.gradle +++ b/printer/build.gradle @@ -12,7 +12,6 @@ version = appVersionName android { compileSdkVersion versions.compileSdk buildToolsVersion versions.buildTools - ndkVersion versions.ndk defaultConfig { minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk diff --git a/sample/build.gradle b/sample/build.gradle index 7a501d260..034b99ad3 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions' android { compileSdkVersion versions.compileSdk buildToolsVersion versions.buildTools - ndkVersion versions.ndk defaultConfig { applicationId "com.tabesto.printer" minSdkVersion versions.minSdk