Skip to content

Commit

Permalink
chore(deps): update wry to 0.28 (#6725)
Browse files Browse the repository at this point in the history
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
  • Loading branch information
amrbashir and lucasfernog committed Apr 23, 2023
1 parent cdad6e0 commit 31444ac
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 40 deletions.
6 changes: 6 additions & 0 deletions .changes/cli-wry-0-28.md
@@ -0,0 +1,6 @@
---
'cli.rs': 'patch'
'cli.js': 'patch'
---

Update mobile template to `wry@0.28`
5 changes: 5 additions & 0 deletions .changes/core-wry-0-28.md
@@ -0,0 +1,5 @@
---
'tauri': 'patch'
---

On Android, update proguard rules.
5 changes: 5 additions & 0 deletions .changes/tauri-runtime-wry-wry-0-28.md
@@ -0,0 +1,5 @@
---
'tauri-runtime-wry': 'patch'
---

Update `wry` to `0.28`
2 changes: 1 addition & 1 deletion core/tauri-runtime-wry/Cargo.toml
Expand Up @@ -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" ] }
Expand Down
28 changes: 2 additions & 26 deletions 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 { }
8 changes: 4 additions & 4 deletions examples/api/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tooling/api/docs/js-api.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tooling/cli/templates/mobile/android/app/build.gradle.kts
Expand Up @@ -37,7 +37,7 @@ android {
getByName("release") {
isMinifyEnabled = true
val proguards = fileTree(".") {
include("*.pro")
include("**/*.pro")
}
proguardFiles(*proguards.toList().toTypedArray())
}
Expand Down
@@ -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()
@@ -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)
}

0 comments on commit 31444ac

Please sign in to comment.