chore(deps): update tauri and Android project (#360)

examples/api/src-tauri/Cargo.toml

@@ -27,7 +27,6 @@ tauri-plugin-notification = { path = "../../../plugins/notification", features =
 tauri-plugin-os = { path = "../../../plugins/os" }
 tauri-plugin-process = { path = "../../../plugins/process" }
 tauri-plugin-shell = { path = "../../../plugins/shell" }
-tauri-plugin-updater = { path = "../../../plugins/updater" }
 tauri-plugin-window = { path = "../../../plugins/window" }
 
 [dependencies.tauri]
@@ -44,6 +43,7 @@ features = [
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 tauri-plugin-cli = { path = "../../../plugins/cli" }
 tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut" }
+tauri-plugin-updater = { path = "../../../plugins/updater" }
 
 [target."cfg(target_os = \"windows\")".dependencies]
 window-shadows = "0.2"

examples/api/src-tauri/gen/android/.gitignore

@@ -13,6 +13,7 @@ build
 .externalNativeBuild
 .cxx
 local.properties
+key.properties
 
 /.tauri
 /tauri.settings.gradle

examples/api/src-tauri/gen/android/api/app/build.gradle.kts

@@ -1,113 +0,0 @@
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-    id("rustPlugin")
-}
-
-android {
-    compileSdk = 33
-    defaultConfig {
-        manifestPlaceholders["usesCleartextTraffic"] = "false"
-        applicationId = "com.tauri.api"
-        minSdk = 24
-        targetSdk = 33
-        versionCode = 1
-        versionName = "1.0"
-    }
-    sourceSets.getByName("main") {
-        // Vulkan validation layers
-        val ndkHome = System.getenv("NDK_HOME")
-        jniLibs.srcDir("${ndkHome}/sources/third_party/vulkan/src/build-android/jniLibs")
-    }
-    buildTypes {
-        getByName("debug") {
-            manifestPlaceholders["usesCleartextTraffic"] = "true"
-            isDebuggable = true
-            isJniDebuggable = true
-            isMinifyEnabled = false
-            packagingOptions {                jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
-                jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
-                jniLibs.keepDebugSymbols.add("*/x86/*.so")
-                jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
-            }
-        }
-        getByName("release") {
-            isMinifyEnabled = true
-            val proguards = fileTree(".") {
-              include("*.pro")
-            }
-            proguardFiles(*proguards.toList().toTypedArray())
-        }
-    }
-    flavorDimensions.add("abi")
-    productFlavors {
-        create("universal") {
-            dimension = "abi"
-            ndk {
-                abiFilters += (findProperty("abiList") as? String)?.split(",") ?: listOf(                    "arm64-v8a",                    "armeabi-v7a",                    "x86",                    "x86_64",
-                )
-            }
-        }
-        create("arm64") {
-            dimension = "abi"
-            ndk {
-                abiFilters += listOf("arm64-v8a")
-            }
-        }
-
-        create("arm") {
-            dimension = "abi"
-            ndk {
-                abiFilters += listOf("armeabi-v7a")
-            }
-        }
-
-        create("x86") {
-            dimension = "abi"
-            ndk {
-                abiFilters += listOf("x86")
-            }
-        }
-
-        create("x86_64") {
-            dimension = "abi"
-            ndk {
-                abiFilters += listOf("x86_64")
-            }
-        }
-    }
-
-    assetPacks += mutableSetOf()
-    namespace = "com.tauri.api"
-}
-
-rust {
-    rootDirRel = "../../../../"
-    targets = (findProperty("targetList") as? String)?.split(",") ?: listOf("aarch64", "armv7", "i686", "x86_64")
-    arches = (findProperty("archList") as? String)?.split(",") ?: listOf("arm64", "arm", "x86", "x86_64")
-}
-
-dependencies {
-    implementation("androidx.webkit:webkit:1.5.0")
-    implementation("androidx.appcompat:appcompat:1.5.1")
-    implementation("com.google.android.material:material:1.7.0")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.4")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
-    implementation(project(":tauri-android"))
-}
-
-apply(from = "tauri.build.gradle.kts")
-
-afterEvaluate {
-    android.applicationVariants.all {
-        tasks["mergeUniversalReleaseJniLibFolders"].dependsOn(tasks["rustBuildRelease"])
-        tasks["mergeUniversalDebugJniLibFolders"].dependsOn(tasks["rustBuildDebug"])
-        if (findProperty("targetList") == null) {
-            productFlavors.filter{ it.name != "universal" }.forEach { _ ->
-                val archAndBuildType = name.capitalize()
-                tasks["merge${archAndBuildType}JniLibFolders"].dependsOn(tasks["rustBuild${archAndBuildType}"])
-            }
-        }
-    }
-}

examples/api/src-tauri/gen/android/api/app/src/main/java/com/tauri/api/MainActivity.kt

@@ -1,7 +0,0 @@
-package com.tauri.api
-
-import app.tauri.plugin.PluginManager
-
-class MainActivity : TauriActivity() {
-  var pluginManager: PluginManager = PluginManager(this)
-}

examples/api/src-tauri/gen/android/api/buildSrc/src/main/java/com/tauri/api/kotlin/RustPlugin.kt

@@ -1,59 +0,0 @@
-package com.tauri
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import java.io.File
-import java.util.*
-
-const val TASK_GROUP = "rust"
-
-open class Config {
-    var rootDirRel: String? = null
-    var targets: List<String>? = null
-    var arches: List<String>? = null
-}
-
-open class RustPlugin : Plugin<Project> {
-    private lateinit var config: Config
-
-    override fun apply(project: Project) {
-        config = project.extensions.create("rust", Config::class.java)
-        project.afterEvaluate {
-            if (config.targets == null) {
-                throw GradleException("targets cannot be null")
-            }
-            if (config.arches == null) {
-                throw GradleException("arches cannot be null")
-            }
-            for (profile in listOf("debug", "release")) {
-                val profileCapitalized = profile.capitalize(Locale.ROOT)
-                val buildTask = project.tasks.maybeCreate(
-                    "rustBuild$profileCapitalized",
-                    DefaultTask::class.java
-                ).apply {
-                    group = TASK_GROUP
-                    description = "Build dynamic library in $profile mode for all targets"
-                }
-                for (targetPair in config.targets!!.withIndex()) {
-                    val targetName = targetPair.value
-                    val targetArch = config.arches!![targetPair.index]
-                    val targetArchCapitalized = targetArch.capitalize(Locale.ROOT)
-                    val targetBuildTask = project.tasks.maybeCreate(
-                        "rustBuild$targetArchCapitalized$profileCapitalized",
-                        BuildTask::class.java
-                    ).apply {
-                        group = TASK_GROUP
-                        description = "Build dynamic library in $profile mode for $targetArch"
-                        rootDirRel = config.rootDirRel?.let { File(it) }
-                        target = targetName
-                        release = profile == "release"
-                    }
-                    buildTask.dependsOn(targetBuildTask)
-                    project.tasks.findByName("preBuild")?.mustRunAfter(targetBuildTask)
-                }
-            }
-        }
-    }
-}

examples/api/src-tauri/gen/android/api/settings.gradle

@@ -1,6 +0,0 @@
-include ':app'
-
-include ':tauri-android'
-project(':tauri-android').projectDir = new File('./.tauri/tauri-api')
-
-apply from: 'tauri.settings.gradle'

examples/api/src-tauri/gen/android/app/.gitignore

@@ -1,4 +1,5 @@
 /src/main/java/com/tauri/api/generated
 /src/main/jniLibs/**/*.so
+/src/main/assets/tauri.conf.json
 /tauri.build.gradle.kts
 /proguard-tauri.pro

examples/api/src-tauri/gen/android/app/build.gradle.kts

@@ -0,0 +1,57 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("rust")
+}
+
+android {
+    compileSdk = 33
+    namespace = "com.tauri.api"
+    defaultConfig {
+        manifestPlaceholders["usesCleartextTraffic"] = "false"
+        applicationId = "com.tauri.api"
+        minSdk = 24
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+    }
+    buildTypes {
+        getByName("debug") {
+            manifestPlaceholders["usesCleartextTraffic"] = "true"
+            isDebuggable = true
+            isJniDebuggable = true
+            isMinifyEnabled = false
+            packaging {                jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
+                jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
+                jniLibs.keepDebugSymbols.add("*/x86/*.so")
+                jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
+            }
+        }
+        getByName("release") {
+            isMinifyEnabled = true
+            proguardFiles(
+                *fileTree(".") { include("**/*.pro") }
+                    .plus(getDefaultProguardFile("proguard-android-optimize.txt"))
+                    .toList().toTypedArray()
+            )
+        }
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+rust {
+    rootDirRel = "../../../"
+}
+
+dependencies {
+    implementation("androidx.webkit:webkit:1.6.1")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.8.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.4")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
+}
+
+apply(from = "tauri.build.gradle.kts")

examples/api/src-tauri/gen/android/app/src/main/AndroidManifest.xml

@@ -14,7 +14,6 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

examples/api/src-tauri/gen/android/app/src/main/java/com/tauri/api/MainActivity.kt

@@ -0,0 +1,3 @@
+package com.tauri.api
+
+class MainActivity : TauriActivity()

examples/api/src-tauri/gen/android/build.gradle.kts

@@ -1,14 +1,11 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath("com.android.tools.build:gradle:8.0.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
     }
 }
 

examples/api/src-tauri/gen/android/buildSrc/build.gradle.kts

@@ -5,8 +5,8 @@ plugins {
 gradlePlugin {
     plugins {
         create("pluginsForCoolKids") {
-            id = "rustPlugin"
-            implementationClass = "com.tauri.RustPlugin"
+            id = "rust"
+            implementationClass = "RustPlugin"
         }
     }
 }
@@ -18,6 +18,6 @@ repositories {
 
 dependencies {
     compileOnly(gradleApi())
-    implementation("com.android.tools.build:gradle:7.3.1")
+    implementation("com.android.tools.build:gradle:8.0.0")
 }
 

examples/api/src-tauri/gen/android/buildSrc/src/main/java/com/tauri/api/kotlin/BuildTask.kt

@@ -1,28 +1,22 @@
-package com.tauri
-
 import java.io.File
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 
 open class BuildTask : DefaultTask() {
-    @InputDirectory
-    @PathSensitive(PathSensitivity.RELATIVE)
-    var rootDirRel: File? = null
+    @Input
+    var rootDirRel: String? = null
     @Input
     var target: String? = null
     @Input
     var release: Boolean? = null
 
     @TaskAction
-    fun build() {
-        val executable = """yarn""";
+    fun assemble() {
+        val executable = """pnpm""";
         try {
             runTauriCli(executable)
         } catch (e: Exception) {
@@ -41,7 +35,7 @@ open class BuildTask : DefaultTask() {
         val args = listOf("tauri", "android", "android-studio-script");
 
         project.exec {
-            workingDir(File(project.projectDir, rootDirRel.path))
+            workingDir(File(project.projectDir, rootDirRel))
             executable(executable)
             args(args)
             if (project.logger.isEnabled(LogLevel.DEBUG)) {

examples/api/src-tauri/gen/android/buildSrc/src/main/java/com/tauri/api/kotlin/RustPlugin.kt

@@ -0,0 +1,85 @@
+import com.android.build.api.dsl.ApplicationExtension
+import org.gradle.api.DefaultTask
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.get
+
+const val TASK_GROUP = "rust"
+
+open class Config {
+    lateinit var rootDirRel: String
+}
+
+open class RustPlugin : Plugin<Project> {
+    private lateinit var config: Config
+
+    override fun apply(project: Project) = with(project) {
+        config = extensions.create("rust", Config::class.java)
+
+        val defaultAbiList = listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64");
+        val abiList = (findProperty("abiList") as? String)?.split(',') ?: defaultAbiList
+
+        val defaultArchList = listOf("arm64", "arm", "x86", "x86_64");
+        val archList = (findProperty("archList") as? String)?.split(',') ?: listOf("arm64", "arm", "x86", "x86_64")
+
+        val targetsList = (findProperty("targetList") as? String)?.split(',') ?: listOf("aarch64", "armv7", "i686", "x86_64")
+
+        extensions.configure<ApplicationExtension> {
+            @Suppress("UnstableApiUsage")
+            flavorDimensions.add("abi")
+            productFlavors {
+                create("universal") {
+                    dimension = "abi"
+                    ndk {
+                        abiFilters += abiList
+                    }
+                }
+                defaultArchList.forEachIndexed { index, arch ->
+                    create(arch) {
+                        dimension = "abi"
+                        ndk {
+                            abiFilters.add(defaultAbiList[index])
+                        }
+                    }
+                }
+            }
+        }
+
+        afterEvaluate {
+            for (profile in listOf("debug", "release")) {
+                val profileCapitalized = profile.replaceFirstChar { it.uppercase() }
+                val buildTask = tasks.maybeCreate(
+                    "rustBuildUniversal$profileCapitalized",
+                    DefaultTask::class.java
+                ).apply {
+                    group = TASK_GROUP
+                    description = "Build dynamic library in $profile mode for all targets"
+                }
+
+                tasks["mergeUniversal${profileCapitalized}JniLibFolders"].dependsOn(buildTask)
+
+                for (targetPair in targetsList.withIndex()) {
+                    val targetName = targetPair.value
+                    val targetArch = archList[targetPair.index]
+                    val targetArchCapitalized = targetArch.replaceFirstChar { it.uppercase() }
+                    val targetBuildTask = project.tasks.maybeCreate(
+                        "rustBuild$targetArchCapitalized$profileCapitalized",
+                        BuildTask::class.java
+                    ).apply {
+                        group = TASK_GROUP
+                        description = "Build dynamic library in $profile mode for $targetArch"
+                        rootDirRel = config.rootDirRel
+                        target = targetName
+                        release = profile == "release"
+                    }
+
+                    buildTask.dependsOn(targetBuildTask)
+                    tasks["merge$targetArchCapitalized${profileCapitalized}JniLibFolders"].dependsOn(
+                        targetBuildTask
+                    )
+                }
+            }
+        }
+    }
+}

examples/api/src-tauri/gen/android/gradle.properties

@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

examples/api/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue May 10 19:22:52 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

examples/api/src-tauri/gen/android/settings.gradle

@@ -0,0 +1,3 @@
+include ':app'
+
+apply from: 'tauri.settings.gradle'

examples/api/src-tauri/src/lib.rs

@@ -40,7 +40,6 @@ pub fn run() {
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_shell::init())
-        .plugin(tauri_plugin_updater::Builder::new().build())
         .plugin(tauri_plugin_window::init())
         .setup(move |app| {
             #[cfg(desktop)]
@@ -49,6 +48,8 @@ pub fn run() {
                 app.handle().plugin(tauri_plugin_cli::init())?;
                 app.handle()
                     .plugin(tauri_plugin_global_shortcut::Builder::new().build())?;
+                app.handle()
+                    .plugin(tauri_plugin_updater::Builder::new().build())?;
             }
 
             let mut window_builder = WindowBuilder::new(app, "main", WindowUrl::default());