Fix cargo-ndk invocation and auto-detect Rust PATH (v0.7.0)

Critical Fixes:
- Fix cargo-ndk invocation: use 'cargo ndk' instead of direct 'cargo-ndk' binary
- Add ANDROID_NDK_HOME environment variable for cargo-ndk compatibility
- Auto-detect Rust installation path (~/.cargo/bin, CARGO_HOME)
- Improve error handling for missing Rust toolchain
- Add graceful version detection fallback

These fixes resolve:
- 'This binary may only be called via cargo ndk' error
- Requirement to manually set cargo.bin in local.properties
- Build failures when Rust is not in system PATH

Author: rodroidmods

build.gradle.kts

@@ -4,15 +4,15 @@ plugins {
     id("com.gradle.plugin-publish") version "1.3.0"
 }
 
-val pluginId = "io.github.MatrixDev.android-rust"
+val pluginId = "io.github.rodroidmods.android-rust"
 
 group = pluginId
-version = "0.6.0"
+version = "0.7.0"
 
 @Suppress("UnstableApiUsage")
 gradlePlugin {
-    website = "https://github.com/MatrixDev/GradleAndroidRustPlugin"
-    vcsUrl = "https://github.com/MatrixDev/GradleAndroidRustPlugin.git"
+    website = "https://github.com/rodroidmods/GradleAndroidRustPlugin"
+    vcsUrl = "https://github.com/rodroidmods/GradleAndroidRustPlugin.git"
 
     plugins {
         create("AndroidRust") {
@@ -44,4 +44,4 @@ dependencies {
 
     implementation(libs.agp)
     implementation(libs.agp.api)
-}
+}

example/app/build.gradle.kts

@@ -1,25 +1,34 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.rust)
 }
 
 android {
-    namespace = "dev.matrix.rust"
-    compileSdk = 33
+    namespace = "dev.rodroid.rust"
+    compileSdk = 36
     ndkVersion = "25.2.9519653"
 
     defaultConfig {
-        applicationId = "dev.matrix.rust"
-        minSdk = 21
-        targetSdk = 33
+        applicationId = "dev.rodroid.rust"
+        minSdk = 26
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
     }
 
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.15"
+    }
+
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
             proguardFiles("proguard-rules.pro")
         }
@@ -32,19 +41,20 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
+    kotlin {
+        jvmToolchain(21)
     }
 }
 
 androidRust {
     module("library") {
         path = file("src/main/jni")
-
+        //targets = listOf("arm64", "x86_64", "arm", "x86")
+        targets = listOf("x86_64")
         buildType("release") {
             runTests = true
         }
@@ -53,10 +63,22 @@ androidRust {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
-    implementation("com.google.android.material:material:1.8.0")
+    implementation(platform(libs.androidx.compose.bom))
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.google.material)
+
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.animation)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
 }

example/app/src/main/AndroidManifest.xml

@@ -4,7 +4,6 @@
 
     <application
         android:allowBackup="true"
-        android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -13,7 +12,7 @@
         android:theme="@style/Theme.GradlePlugin"
         tools:targetApi="31">
         <activity
-            android:name="dev.matrix.rust.MainActivity"
+            android:name="dev.rodroid.rust.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.GradlePlugin.NoActionBar">

example/app/src/main/java/dev/matrix/rust/MainActivity.kt

@@ -0,0 +1,50 @@
+package dev.rodroid.rust
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import kotlinx.coroutines.delay
+import androidx.compose.ui.text.style.TextAlign
+
+class MainActivity : ComponentActivity() {
+
+    private external fun callRustCode(): String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        System.loadLibrary("rust_library")
+
+        setContent {
+            MaterialTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = Color.Black
+                ) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .background(Color.Black),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Text(
+                            text = callRustCode(),
+                            color = Color.Red,
+                            style = MaterialTheme.typography.headlineLarge,
+                            textAlign = TextAlign.Center
+                        )
+                    }
+                }
+            }
+        }
+    }
+}

example/app/src/main/java/dev/rodroid/rust/MainActivity.kt

@@ -1,10 +1,27 @@
 [package]
 name = "rust_library"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 jni = "0.19.0"
+
+[profile.release]
+opt-level = "z"
+lto = true
+codegen-units = 1
+panic = "abort"
+strip = "symbols"
+debug = false
+overflow-checks = false
+incremental = false
+
+[profile.release.package."*"]
+opt-level = "z"
+codegen-units = 1
+strip = true
+debug = false
+overflow-checks = false

example/app/src/main/jni/Cargo.toml

@@ -1,16 +1,12 @@
-use jni::JNIEnv;
-use jni::objects::JObject;
+use jni::{JNIEnv, objects::JObject};
 use jni::sys::jstring;
 
-#[no_mangle]
-extern "C" fn Java_dev_matrix_rust_MainActivity_callRustCode(env: JNIEnv, _: JObject) -> jstring {
-    env.new_string("Hello from rust!").unwrap().into_inner()
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test() {
-        println!("Hello from rust test!")
-    }
-}
+#[unsafe(no_mangle)]
+pub extern "C" fn Java_dev_rodroid_rust_MainActivity_callRustCode(
+    env: JNIEnv,
+    _: JObject,
+) -> jstring {
+    let message = "Hello from Rust";
+    let java_string = env.new_string(message).expect("Couldn't create java string!");
+    java_string.into_inner()
+}