diff --git a/plugin/src/main/resources/com/nishtahir/linker-wrapper.py b/plugin/src/main/resources/com/nishtahir/linker-wrapper.py index 00f6f2a..bbe807d 100755 --- a/plugin/src/main/resources/com/nishtahir/linker-wrapper.py +++ b/plugin/src/main/resources/com/nishtahir/linker-wrapper.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, print_function, unicode_literals import os -import pipes +import shlex import subprocess import sys @@ -33,7 +33,7 @@ def update_in_place(arglist): # This only appears when the subprocess call fails, but it's helpful then. -printable_cmd = " ".join(pipes.quote(arg) for arg in args) +printable_cmd = " ".join(shlex.quote(arg) for arg in args) print(printable_cmd) sys.exit(subprocess.call(args)) diff --git a/plugin/src/test/groovy/com/nishtahir/NdkVersionTest.groovy b/plugin/src/test/groovy/com/nishtahir/NdkVersionTest.groovy index 0a35ffb..b409b40 100644 --- a/plugin/src/test/groovy/com/nishtahir/NdkVersionTest.groovy +++ b/plugin/src/test/groovy/com/nishtahir/NdkVersionTest.groovy @@ -57,8 +57,8 @@ class NdkVersionTest extends AbstractTest { ndkVersion << [ // Partial list of NDK versions supported by Github Actions, per // https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md - "25.2.9519653", - "26.2.11394342", + "26.3.11579264", + "27.2.12479018", ] } } diff --git a/plugin/src/test/groovy/com/nishtahir/SimpleAndroidApp.groovy b/plugin/src/test/groovy/com/nishtahir/SimpleAndroidApp.groovy index 41c5970..c539083 100644 --- a/plugin/src/test/groovy/com/nishtahir/SimpleAndroidApp.groovy +++ b/plugin/src/test/groovy/com/nishtahir/SimpleAndroidApp.groovy @@ -275,7 +275,7 @@ class SimpleAndroidApp { boolean kaptWorkersEnabled = true VersionNumber androidVersion = Versions.latestAndroidVersion() - VersionNumber ndkVersion = Versions.latestAndroidVersion() >= android("3.4.0") ? VersionNumber.parse("26.2.11394342") : null + VersionNumber ndkVersion = Versions.latestAndroidVersion() >= android("3.4.0") ? VersionNumber.parse("26.3.11579264") : null VersionNumber kotlinVersion = VersionNumber.parse("1.3.72") File projectDir diff --git a/samples/app/build.gradle b/samples/app/build.gradle index c54a2eb..2c4bd13 100644 --- a/samples/app/build.gradle +++ b/samples/app/build.gradle @@ -17,7 +17,7 @@ apply plugin: 'org.mozilla.rust-android-gradle.rust-android' android { compileSdkVersion 27 - ndkVersion "26.2.11394342" + ndkVersion "26.3.11579264" defaultConfig { applicationId "com.nishtahir.androidrust" diff --git a/samples/library/build.gradle b/samples/library/build.gradle index 7eff8cd..9312d26 100644 --- a/samples/library/build.gradle +++ b/samples/library/build.gradle @@ -17,7 +17,7 @@ apply plugin: 'org.mozilla.rust-android-gradle.rust-android' android { compileSdkVersion 27 - ndkVersion "26.2.11394342" + ndkVersion "26.3.11579264" defaultConfig { minSdkVersion 21