fixed linux build

Author: matrixdev

example/app/build.gradle.kts

@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         applicationId = "dev.matrix.rust"
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }
@@ -39,10 +39,10 @@ androidRust {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.8.0")
-    implementation("androidx.appcompat:appcompat:1.4.2")
+    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.1")
-    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
-    implementation("com.google.android.material:material:1.6.1")
+    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")
 }

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

@@ -1,6 +1,7 @@
 package dev.matrix.agp.rust
 
 import dev.matrix.agp.rust.utils.Abi
+import dev.matrix.agp.rust.utils.Os
 import dev.matrix.agp.rust.utils.SemanticVersion
 import org.gradle.api.DefaultTask
 import org.gradle.api.provider.Property
@@ -45,11 +46,18 @@ internal abstract class RustBuildTask : DefaultTask() {
         val variantBuildDirectory = variantBuildDirectory.get()
         val variantJniLibsDirectory = variantJniLibsDirectory.get()
 
+        val platform = when (Os.current) {
+            Os.Linux -> "linux-x86_64"
+            Os.MacOs -> "darwin-x86_64"
+            Os.Windows -> "windows-x86_64"
+            Os.Unknown -> throw Exception("OS is not supported")
+        }
+
         var toolchainFolder = ndkDirectory
         toolchainFolder = File(toolchainFolder, "toolchains")
         toolchainFolder = File(toolchainFolder, "llvm")
         toolchainFolder = File(toolchainFolder, "prebuilt")
-        toolchainFolder = File(toolchainFolder, "darwin-x86_64")
+        toolchainFolder = File(toolchainFolder, platform)
         toolchainFolder = File(toolchainFolder, "bin")
 
         val cc = File(toolchainFolder, abi.cc(apiLevel))

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

@@ -9,7 +9,7 @@ internal fun installRustComponentsIfNeeded(
     minimalVersion: SemanticVersion?,
     abiSet: Collection<Abi>,
 ) {
-    if (Os.isWindows) {
+    if (Os.current.isWindows) {
         return
     }
 

plugin/src/main/java/dev/matrix/agp/rust/utils/Abi.kt

@@ -55,12 +55,12 @@ internal enum class Abi(
         }
     }
 
-    fun cc(apiLevel: Int) = when (Os.isWindows) {
+    fun cc(apiLevel: Int) = when (Os.current.isWindows) {
         true -> "${compilerTriple}${apiLevel}-clang.cmd"
         else -> "${compilerTriple}${apiLevel}-clang"
     }
 
-    fun ccx(apiLevel: Int) = when (Os.isWindows) {
+    fun ccx(apiLevel: Int) = when (Os.current.isWindows) {
         true -> "${compilerTriple}${apiLevel}-clang++.cmd"
         else -> "${compilerTriple}${apiLevel}-clang++"
     }

plugin/src/main/java/dev/matrix/agp/rust/utils/Os.kt

@@ -1,8 +1,39 @@
 package dev.matrix.agp.rust.utils
 
-internal object Os {
+import org.gradle.internal.os.OperatingSystem
+
+internal enum class Os {
+    Linux,
+    MacOs,
+    Windows,
+    Unknown;
+
+    companion object {
+        val current: Os
+
+        init {
+            val os = OperatingSystem.current()
+            current = when {
+                os.isLinux -> Linux
+                os.isMacOsX -> MacOs
+                os.isWindows -> Windows
+                else -> Unknown
+            }
+        }
+    }
+
+    val isLinux: Boolean
+        get() {
+            return this == Linux
+        }
+
+    val isMacOs: Boolean
+        get() {
+            return this == MacOs
+        }
+
     val isWindows: Boolean
         get() {
-            return System.getProperty("os.name").orEmpty().startsWith("windows", ignoreCase = true)
+            return this == Windows
         }
 }