Skip to content

fix(android): migrate CargoKit to Android Components #22

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

Merged
iota9star merged 2 commits into from
Sep 30, 2026
Merged

fix(android): migrate CargoKit to Android Components #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f755a81
fix(android): support AGP 9 variant and compile SDK APIs
HsukqiLee Aug 19, 2026
c962e54
Merge branch 'main' into fix/agp9-compile-sdk-and-variants
iota9star Sep 30, 2026
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
24 changes: 15 additions & 9 deletions cargokit/gradle/plugin.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ import org.gradle.process.ExecOperations
import javax.inject.Inject
import java.nio.file.Paths

class AndroidSdkVersionParser {
static int parse(Object value) {
def matcher = value.toString() =~ /\d+/
if (!matcher.find()) {
throw new GradleException("Unsupported Android SDK version: ${value}")
}
return matcher.group() as int
}
}

CargoKitPlugin.file = buildscript.sourceFile

apply plugin: CargoKitPlugin
Expand Down Expand Up @@ -128,13 +138,9 @@ class CargoKitPlugin implements Plugin<Project> {
def projectBuildDir = project.layout.buildDirectory.get().asFile
def cargoBuildDir = new File(projectBuildDir, "build").path

// Determine if the project is an application or library
def isApplication = plugin.project.plugins.hasPlugin('com.android.application')
def variants = isApplication ? plugin.project.android.applicationVariants : plugin.project.android.libraryVariants

variants.all { variant ->

final buildType = variant.buildType.name
def androidComponents = project.extensions.getByName("androidComponents")
androidComponents.onVariants(androidComponents.selector().all()) { variant ->
final buildType = variant.buildType

def cargoOutputDir = new File(projectBuildDir, "jniLibs/${buildType}").path;
def jniLibs = project.android.sourceSets.maybeCreate(buildType).jniLibs;
Expand Down Expand Up @@ -171,13 +177,13 @@ class CargoKitPlugin implements Plugin<Project> {
}

def task = project.tasks.create(taskName, CargoKitBuildTask.class) {
buildMode = variant.buildType.name
buildMode = buildType
buildDir = cargoBuildDir
outputDir = cargoOutputDir
ndkVersion = plugin.project.android.ndkVersion
sdkDirectory = plugin.project.android.sdkDirectory
minSdkVersion = plugin.project.android.defaultConfig.minSdkVersion.apiLevel as int
compileSdkVersion = plugin.project.android.compileSdkVersion.substring(8) as int
compileSdkVersion = AndroidSdkVersionParser.parse(plugin.project.android.compileSdkVersion)
targetPlatforms = platforms
pluginFile = CargoKitPlugin.file
}
Expand Down
Loading