Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump NDK versions to match -latest Github runner images. #156

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Bump NDK versions to match -latest Github runner images. #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
484704b
Bump NDK versions to match `-latest` Github runner images.
ncalexan Dec 4, 2024
43e524f
Update linker-wrapper.py
badboy Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugin/src/main/resources/com/nishtahir/linker-wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import, print_function, unicode_literals

import os
import pipes
import shlex
import subprocess
import sys

Expand Down Expand Up @@ -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))
4 changes: 2 additions & 2 deletions plugin/src/test/groovy/com/nishtahir/NdkVersionTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
}
}
2 changes: 1 addition & 1 deletion plugin/src/test/groovy/com/nishtahir/SimpleAndroidApp.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion samples/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading