Explorar o código

chore(deps): update wry to 0.28 (#6725)

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
Amr Bashir %!s(int64=2) %!d(string=hai) anos
pai
achega
31444ac196

+ 6 - 0
.changes/cli-wry-0-28.md

@@ -0,0 +1,6 @@
+---
+'cli.rs': 'patch'
+'cli.js': 'patch'
+---
+
+Update mobile template to `wry@0.28`

+ 5 - 0
.changes/core-wry-0-28.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch'
+---
+
+On Android, update proguard rules.

+ 5 - 0
.changes/tauri-runtime-wry-wry-0-28.md

@@ -0,0 +1,5 @@
+---
+'tauri-runtime-wry': 'patch'
+---
+
+Update `wry` to `0.28`

+ 1 - 1
core/tauri-runtime-wry/Cargo.toml

@@ -13,7 +13,7 @@ exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
 
 [dependencies]
-wry = { version = "0.27.3", default-features = false, features = [ "file-drop", "protocol" ] }
+wry = { version = "0.28.1", default-features = false, features = [ "file-drop", "protocol" ] }
 tauri-runtime = { version = "0.13.0-alpha.4", path = "../tauri-runtime" }
 tauri-utils = { version = "2.0.0-alpha.4", path = "../tauri-utils" }
 uuid = { version = "1", features = [ "v4" ] }

+ 2 - 26
core/tauri/mobile/proguard-tauri.pro

@@ -1,30 +1,6 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 
--keep class $PACKAGE.* {
-  native <methods>;
-}
-
--keepclassmembers class $PACKAGE.TauriActivity {
-  getAppClass(...);
-  getVersion();
-}
-
--keep class $PACKAGE.RustWebView {
-  public <init>(...);
-  loadUrlMainThread(...);
-}
 
--keep class $PACKAGE.Ipc {
-  public <init>(...);
-  @android.webkit.JavascriptInterface public <methods>;
+-keep class $PACKAGE.TauriActivity {
+  public app.tauri.plugin.PluginManager getPluginManager();
 }
-
--keep class $PACKAGE.RustWebChromeClient,$PACKAGE.RustWebViewClient {
-  public <init>(...);
-}
-
--keep class $PACKAGE.MainActivity {
-  public getPluginManager();
-}
-
--keep class androidx.appcompat.app.AppCompatActivity { }

+ 4 - 4
examples/api/src-tauri/Cargo.lock

@@ -2822,9 +2822,9 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.18.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d16138f5d521fcde40580e1a34df784b063dd9ac05c7cbe344bf01f02a23be"
+checksum = "389820c5cd5279ffdde7729baa9cf4db20e9936e11b1e171a20fb74babe3a6d3"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -4001,9 +4001,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.27.3"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8cf0dbfa7ccbd2e3832a3098b19d4b552360ea00a40b244a99caef46bffd84f"
+checksum = "0bc4072414a89ef95559d499f3b1930c773fb4457759ec78fe3a9849883ee22d"
 dependencies = [
  "base64 0.13.1",
  "block",

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
tooling/api/docs/js-api.json


+ 1 - 1
tooling/cli/templates/mobile/android/app/build.gradle.kts

@@ -37,7 +37,7 @@ android {
         getByName("release") {
             isMinifyEnabled = true
             val proguards = fileTree(".") {
-              include("*.pro")
+              include("**/*.pro")
             }
             proguardFiles(*proguards.toList().toTypedArray())
         }

+ 1 - 5
tooling/cli/templates/mobile/android/app/src/main/MainActivity.kt

@@ -1,7 +1,3 @@
 package {{reverse-domain app.domain}}.{{snake-case app.name}}
 
-import app.tauri.plugin.PluginManager
-
-class MainActivity : TauriActivity() {
-  var pluginManager: PluginManager = PluginManager(this)
-}
+class MainActivity : TauriActivity()

+ 4 - 2
tooling/cli/templates/mobile/android/app/src/main/generated/TauriActivity.kt

@@ -1,5 +1,7 @@
 package {{reverse-domain app.domain}}.{{snake-case app.name}}
 
-import androidx.appcompat.app.AppCompatActivity
+import app.tauri.plugin.PluginManager
 
-abstract class TauriActivity : AppCompatActivity()
+abstract class TauriActivity : WryActivity() {
+  var pluginManager: PluginManager = PluginManager(this)
+}

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio