[#5] Update project structure and gradle version

build.gradle.kts

@@ -1,29 +1,45 @@
-buildscript {
-    val kotlinVersion by extra { "1.5.31" }
+plugins {
+    `java-gradle-plugin`
+    `kotlin-dsl`
+    id("com.gradle.plugin-publish") version "1.3.0"
+}
 
-    repositories {
-        google()
-        mavenCentral()
-        maven("https://plugins.gradle.org/m2/")
-    }
+val pluginId = "io.github.MatrixDev.android-rust"
+
+group = pluginId
+version = "0.3.2"
+
+gradlePlugin {
+    website = "https://github.com/MatrixDev/GradleAndroidRustPlugin"
+    vcsUrl = "https://github.com/MatrixDev/GradleAndroidRustPlugin.git"
 
-    dependencies {
-        classpath("com.android.tools.build:gradle:7.2.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+    plugins {
+        create("AndroidRust") {
+            id = pluginId
+            implementationClass = "dev.matrix.agp.rust.AndroidRustPlugin"
+            displayName = "Plugin for building Rust with Cargo in Android projects"
+            description = "This plugin helps with building Rust JNI libraries with Cargo for use in Android projects."
+        }
     }
 }
 
-allprojects {
+publishing {
     repositories {
-        google()
-        mavenCentral()
-        maven("https://plugins.gradle.org/m2/")
+        maven {
+            url = uri(layout.buildDirectory.dir("repo"))
+        }
     }
 }
 
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
-    rootProject.childProjects.forEach { project ->
-        delete(project.value.buildDir)
-    }
+repositories {
+    mavenCentral()
+    google()
+    maven("https://plugins.gradle.org/m2/")
+}
+
+dependencies {
+    gradleApi()
+
+    implementation(libs.agp)
+    implementation(libs.agp.api)
 }

example/app/build.gradle.kts

@@ -1,10 +1,11 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("io.github.MatrixDev.android-rust")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.android.rust)
 }
 
 android {
+    namespace = "dev.matrix.rust"
     compileSdk = 33
     ndkVersion = "25.2.9519653"
 

example/build.gradle.kts

@@ -1,28 +1,6 @@
-buildscript {
-    val kotlinVersion by extra { "1.7.0" }
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.android.tools.build:gradle:7.2.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("io.github.MatrixDev.android-rust:plugin:*")
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-task<Delete>("clean") {
-    delete(rootProject.buildDir)
-    rootProject.childProjects.values.forEach { project ->
-        delete(project.buildDir)
-    }
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.android.rust) apply false
 }

example/gradle/libs.versions.toml

@@ -0,0 +1,31 @@
+[versions]
+agp = "8.7.3"
+kotlin = "2.0.0"
+coreKtx = "1.15.0"
+junit = "4.13.2"
+junitVersion = "1.1.5"
+espressoCore = "3.5.1"
+lifecycleRuntimeKtx = "2.8.7"
+activityCompose = "1.9.3"
+composeBom = "2024.04.01"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-rust = { id = "io.github.MatrixDev.android-rust", version = "0.3.2" }

example/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 12 14:27:36 EEST 2022
+#Wed Dec 04 11:21:35 EET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

example/settings.gradle.kts

@@ -1,9 +1,31 @@
-rootProject.name = "android-rust-example"
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        mavenCentral()
+        google()
+        maven("https://plugins.gradle.org/m2/")
+    }
+}
+
+rootProject.name = "android-rust-example"
 include(":app")
 
 includeBuild("..") {
     dependencySubstitution {
-        substitute(module("io.github.MatrixDev.android-rust:plugin")).using(project(":plugin"))
+        substitute(module("io.github.MatrixDev.android-rust:plugin"))
     }
 }

gradle/libs.versions.toml

@@ -0,0 +1,6 @@
+[versions]
+agp = "8.7.2"
+
+[libraries]
+agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
+agp-api = { module = "com.android.tools.build:gradle-api", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jun 12 14:27:36 EEST 2022
+#Wed Dec 04 11:21:35 EET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists