changed plugin id

changed version to 0.2.1

Author: matrixdev

example/app/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("dev.matrix.android-rust")
+    id("io.github.MatrixDev.android-rust")
 }
 
 android {

example/app/src/rust_library/.gitignore

@@ -0,0 +1,2 @@
+/target
+/Cargo.lock

example/app/src/rust_library/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "rust_library"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+jni = "0.19.0"

example/app/src/rust_library/src/lib.rs

@@ -0,0 +1,8 @@
+use jni::JNIEnv;
+use jni::objects::JObject;
+use jni::sys::jstring;
+
+#[no_mangle]
+extern fn Java_dev_matrix_rust_MainActivity_callRustCode(env: JNIEnv, _: JObject) -> jstring {
+    env.new_string("hello from rust").unwrap().into_inner()
+}

example/build.gradle.kts

@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle:7.2.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("dev.matrix.android-rust:plugin:*")
+        classpath("io.github.MatrixDev.android-rust:plugin:*")
     }
 }
 

example/settings.gradle.kts

@@ -4,6 +4,6 @@ include(":app")
 
 includeBuild("..") {
     dependencySubstitution {
-        substitute(module("dev.matrix.android-rust:plugin")).using(project(":plugin"))
+        substitute(module("io.github.MatrixDev.android-rust:plugin")).using(project(":plugin"))
     }
 }

plugin/build.gradle.kts

@@ -5,8 +5,8 @@ plugins {
     id("com.gradle.plugin-publish") version "1.1.0"
 }
 
-group = "dev.matrix.android-rust"
-version = "0.2.0"
+group = "io.github.MatrixDev.android-rust"
+version = "0.2.1"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_11
@@ -21,13 +21,13 @@ repositories {
 pluginBundle {
     website = "https://github.com/MatrixDev/GradleAndroidRustPlugin"
     vcsUrl = "https://github.com/MatrixDev/GradleAndroidRustPlugin.git"
-    tags = listOf("android", "rust")
+    tags = listOf("android", "rust", "jni")
 }
 
 gradlePlugin {
     plugins {
-        create("androidRustPlugin") {
-            id = "dev.matrix.android-rust"
+        create("androidRust") {
+            id = "io.github.MatrixDev.android-rust"
             implementationClass = "dev.matrix.agp.rust.AndroidRustPlugin"
             displayName = "Plugin for building Rust with Cargo in Android projects"
             description = "A plugin that helps build Rust JNI libraries with Cargo for use in Android projects."

plugin/src/main/java/dev/matrix/agp/rust/AndroidRustPlugin.kt

@@ -15,7 +15,7 @@ import java.util.*
 // TODO: migrate to variant API with artifacts when JNI will be supported
 // https://developer.android.com/studio/build/extend-agp#access-modify-artifacts
 //
-@Suppress("unused")
+@Suppress("unused", "UnstableApiUsage")
 class AndroidRustPlugin : Plugin<Project> {
     override fun apply(project: Project) {
         val extension = project.extensions.create("androidRust", AndroidRustExtension::class.java)
@@ -61,10 +61,7 @@ class AndroidRustPlugin : Plugin<Project> {
                     tasksByBuildType.getOrPut(buildType.name, ::ArrayList).add(buildTask)
                 }
 
-                val sourceSet = dsl.sourceSets.findByName(buildType.name)
-                if (sourceSet != null) {
-                    sourceSet.jniLibs.srcDir(variantJniLibsDirectory)
-                }
+                dsl.sourceSets.findByName(buildType.name)?.jniLibs?.srcDir(variantJniLibsDirectory)
             }
 
             installRustComponentsIfNeeded(project, minimumSupportedRustVersion, allRustAbiSet)